codys12/MergeLlama · Datasets at Hugging Face

conflict_resolution stringlengths 27 16k
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= // foreach (var a in new[] ...) if (node is ForEachStatementSyntax) { ForEachExpressionCheck(node, semanticModel, reportDiagnostic, filePath, cancellationToken); return; } >>>>>>> <<<<<<< private static void EqualsValueClauseCheck(SyntaxNode node, SemanticModel semanticModel, Action<Diagnostic> reportDiagnostic, string filePath) ======= private static void ForEachExpressionCheck(SyntaxNode node, SemanticModel semanticModel, Action<Diagnostic> reportDiagnostic, string filePath, CancellationToken cancellationToken) { var foreachExpression = node as ForEachStatementSyntax; if (foreachExpression.Expression != null) { var typeInfo = semanticModel.GetTypeInfo(foreachExpression.Expression, cancellationToken); if (typeInfo.Type != null) { var arraySymbol = typeInfo.Type as IArrayTypeSymbol; if (arraySymbol != null && arraySymbol.ElementType.IsValueType) { reportDiagnostic(Diagnostic.Create(ValueTypeToReferenceTypeConversionRule, foreachExpression.Expression.GetLocation(), EmptyMessageArgs)); return; } var namedTypeSymbol = typeInfo.Type as INamedTypeSymbol; if (namedTypeSymbol != null && namedTypeSymbol.Arity == 1 && namedTypeSymbol.TypeArguments[0].IsValueType && foreachExpression.Type != null) { var leftHandType = semanticModel.GetTypeInfo(foreachExpression.Type, cancellationToken).Type; if (leftHandType != null && leftHandType.IsValueType) { reportDiagnostic(Diagnostic.Create(ValueTypeToReferenceTypeConversionRule, foreachExpression.Expression.GetLocation(), EmptyMessageArgs)); return; } } } } } private static void EqualsValueClauseCheck(SyntaxNode node, SemanticModel semanticModel, Action<Diagnostic> reportDiagnostic, string filePath, CancellationToken cancellationToken) >>>>>>> private static void EqualsValueClauseCheck(SyntaxNode node, SemanticModel semanticModel, Action<Diagnostic> reportDiagnostic, string filePath, CancellationToken cancellationToken) <<<<<<< var symbolInfo = semanticModel.GetSymbolInfo(node).Symbol; if (symbolInfo?.ContainingType?.IsValueType == true && !insideObjectCreation) ======= var symbolInfo = semanticModel.GetSymbolInfo(node, cancellationToken).Symbol; if (symbolInfo != null && symbolInfo.ContainingType != null && symbolInfo.ContainingType.IsValueType) >>>>>>> var symbolInfo = semanticModel.GetSymbolInfo(node, cancellationToken).Symbol; if (symbolInfo?.ContainingType?.IsValueType == true && !insideObjectCreation)
<<<<<<< ======= using System.Xml; using System.Collections.Specialized; >>>>>>> using System.Xml; using System.Collections.Specialized; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(System.ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; #pragma warning disable 0219 ======= using Xunit; >>>>>>> using Xunit; #pragma warning disable 0219 <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< #endif private int _projectId; ======= private int projectId; >>>>>>> #endif private int projectId; <<<<<<< #endif private BuildEventContext _parentProjectBuildEventContext; ======= private BuildEventContext parentProjectBuildEventContext; >>>>>>> #endif private BuildEventContext parentProjectBuildEventContext; <<<<<<< #endif private IDictionary<string, string> _globalProperties; ======= private IDictionary<string, string> globalProperties; >>>>>>> #endif private IDictionary<string, string> globalProperties; <<<<<<< #endif private string _toolsVersion; ======= private string toolsVersion; >>>>>>> #endif private string toolsVersion; <<<<<<< #endif private IEnumerable _properties; ======= private IEnumerable properties; >>>>>>> #endif private IEnumerable properties; <<<<<<< #endif private IEnumerable _items; ======= private IEnumerable items; >>>>>>> #endif private IEnumerable items;
<<<<<<< private string _pathToMSBuildExe = Path.Combine(Environment.CurrentDirectory, "MSBuild.exe"); #if FEATURE_SPECIAL_FOLDERS ======= private string _pathToMSBuildExe = Path.Combine(Directory.GetCurrentDirectory(), "MSBuild.exe"); >>>>>>> private string _pathToMSBuildExe = Path.Combine(Directory.GetCurrentDirectory(), "MSBuild.exe"); #if FEATURE_SPECIAL_FOLDERS
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using System.Reflection; using System.Collections; using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; using System.Text.RegularExpressions; >>>>>>> using System.Reflection; using System.Collections; using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; using System.Text.RegularExpressions; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] public class SolutionProjectGenerator_Tests ======= public class SolutionProjectGenerator_Tests : IDisposable >>>>>>> public class SolutionProjectGenerator_Tests : IDisposable <<<<<<< [SetUp] public void Setup() ======= public SolutionProjectGenerator_Tests() >>>>>>> public SolutionProjectGenerator_Tests() <<<<<<< [TearDown] public void Cleanup() ======= public void Dispose() >>>>>>> public void Dispose() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact(Skip = "Ignored in MSTest")] // Ignore: Needs investigation >>>>>>> [Fact(Skip = "Ignored in MSTest")] // Ignore: Needs investigation <<<<<<< Assert.AreEqual(t.DefaultSubToolsetVersion, instances[0].SubToolsetVersion); if (t.DefaultSubToolsetVersion != null) { Assert.AreEqual(t.DefaultSubToolsetVersion, instances[0].GetPropertyValue("VisualStudioVersion")); } else { Assert.AreEqual(String.Empty, instances[0].GetPropertyValue("VisualStudioVersion")); } ======= Assert.Equal(t.DefaultSubToolsetVersion, instances[0].SubToolsetVersion); Assert.Equal(t.DefaultSubToolsetVersion, instances[0].GetPropertyValue("VisualStudioVersion")); >>>>>>> Assert.Equal(t.DefaultSubToolsetVersion, instances[0].SubToolsetVersion); if (t.DefaultSubToolsetVersion != null) { Assert.Equal(t.DefaultSubToolsetVersion, instances[0].GetPropertyValue("VisualStudioVersion")); } else { Assert.Equal(String.Empty, instances[0].GetPropertyValue("VisualStudioVersion")); } <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [Ignore] ======= [Fact(Skip = "Ignored in MSTest")] >>>>>>> [Fact(Skip = "Ignored in MSTest")] <<<<<<< [Test] [Ignore] ======= [Fact(Skip = "Ignored in MSTest")] >>>>>>> [Fact(Skip = "Ignored in MSTest")] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using System.Text.RegularExpressions; using System.Threading; using Microsoft.Build.Framework; >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [SetUp] public void SetUp() { _nodeRequestId++; } [TearDown] public void TearDown() { } [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(ArgumentNullException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< internal static StreamWriter OpenWrite(string path, bool append, Encoding encoding = null) { const int DefaultFileStreamBufferSize = 4096; FileMode mode = append ? FileMode.Append : FileMode.Create; Stream fileStream = new FileStream(path, mode, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamWriter(fileStream); } else { return new StreamWriter(fileStream, encoding); } } internal static StreamReader OpenRead(string path, Encoding encoding = null, bool detectEncodingFromByteOrderMarks = true) { const int DefaultFileStreamBufferSize = 4096; Stream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamReader(fileStream); } else { return new StreamReader(fileStream, encoding, detectEncodingFromByteOrderMarks); } } ======= /// <summary> /// Returns true when the entry point application is Visual Studio. /// </summary> internal static bool RunningInVisualStudio { get { // Check if initialized and do so if not yet if (!s_runningInVisualStudio.HasValue) { GetExecutionInfo(); } return s_runningInVisualStudio.Value; } } >>>>>>> /// <summary> /// Returns true when the entry point application is Visual Studio. /// </summary> internal static bool RunningInVisualStudio { get { // Check if initialized and do so if not yet if (!s_runningInVisualStudio.HasValue) { GetExecutionInfo(); } return s_runningInVisualStudio.Value; } } internal static StreamWriter OpenWrite(string path, bool append, Encoding encoding = null) { const int DefaultFileStreamBufferSize = 4096; FileMode mode = append ? FileMode.Append : FileMode.Create; Stream fileStream = new FileStream(path, mode, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamWriter(fileStream); } else { return new StreamWriter(fileStream, encoding); } } internal static StreamReader OpenRead(string path, Encoding encoding = null, bool detectEncodingFromByteOrderMarks = true) { const int DefaultFileStreamBufferSize = 4096; Stream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamReader(fileStream); } else { return new StreamReader(fileStream, encoding, detectEncodingFromByteOrderMarks); } }
<<<<<<< using UniInject; using UnityEngine.EventSystems; ======= using System.Globalization; using System.Threading; >>>>>>> using UniInject; using UnityEngine.EventSystems; using System.Globalization; using System.Threading;
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [SetUp] public void Setup() ======= public AssemblyTaskFactory_Tests() >>>>>>> public AssemblyTaskFactory_Tests() <<<<<<< /// <summary> /// Tear down what was created in setup /// </summary> [TearDown] public void TearDownAttribute() { _taskFactory = null; _loadInfo = null; _loadedType = null; } ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [Ignore] ======= [Fact(Skip = "Ignored in MSTest")] >>>>>>> [Fact(Skip = "Ignored in MSTest")] <<<<<<< Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); ======= Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); >>>>>>> Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); ======= Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); >>>>>>> Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask);
<<<<<<< using NUnit.Framework; ======= using System.Collections; >>>>>>> using System.Collections; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using System.Collections.Generic; using System.Text; >>>>>>> using System.Collections.Generic; using System.Text; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(LoggerException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< string log = null; try { SetUpFileLoggerAndLogMessage("logfile=\|\|/invalid\|\|", new BuildMessageEventArgs("message here", null, null, MessageImportance.High)); } finally ======= Assert.Throws<LoggerException>(() => >>>>>>> Assert.Throws<LoggerException>(() => <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(LoggerException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(LoggerException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] [ExpectedException(typeof(LoggerException))] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] [Ignore] // Ignore: See https://github.com/dotnet/roslyn/pull/2772 // This is a known issue in Roslyn. This test should be enabled if Roslyn is updated for this scenario. >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] [Ignore] // Ignore: See https://github.com/dotnet/roslyn/pull/2772 // This is a known issue in Roslyn. This test should be enabled if Roslyn is updated for this scenario. >>>>>>> [Test]
<<<<<<< using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Construction; ======= >>>>>>> using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Construction; <<<<<<< ======= using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Xunit; >>>>>>> using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [TestFixtureSetUp] public void SuiteSetup() ======= public ConsoleLoggerTest() >>>>>>> public ConsoleLoggerTest() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using System.Runtime.Serialization.Formatters.Binary; ======= using Microsoft.Build.Framework; >>>>>>> using Microsoft.Build.Framework; <<<<<<< using NUnit.Framework; ======= using System.Text.RegularExpressions; using Xunit; >>>>>>> using System.Text.RegularExpressions; using System.Runtime.Serialization.Formatters.Binary; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using Microsoft.Build.Shared; ======= using System.Reflection; using Microsoft.Build.Framework; >>>>>>> using System.Reflection; using Microsoft.Build.Framework; <<<<<<< using NUnit.Framework; ======= using Microsoft.Build.Shared; using Xunit; >>>>>>> using Microsoft.Build.Shared; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.DelaySign, "DelaySign should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/delaysign"), false /* no response file /); ======= Assert.False(t.DelaySign); // "DelaySign should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/delaysign", false / no response file /); >>>>>>> Assert.False(t.DelaySign); // "DelaySign should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/delaysign"), false / no response file /); <<<<<<< Assert.IsTrue(t.DelaySign, "DelaySign should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/delaysign"), false / no response file /); ======= Assert.True(t.DelaySign); // "DelaySign should be true" CommandLine.ValidateHasParameter(t, @"/delaysign", false / no response file /); >>>>>>> Assert.True(t.DelaySign); // "DelaySign should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/delaysign"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.KeyContainer, "KeyContainer should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:"), false / no response file /); ======= Assert.Null(t.KeyContainer); // "KeyContainer should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/keycontainer:", false / no response file /); >>>>>>> Assert.Null(t.KeyContainer); // "KeyContainer should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.KeyContainer, "KeyContainer should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:"), false / no response file /); ======= Assert.Null(t.KeyContainer); // "KeyContainer should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/keycontainer:", false / no response file /); >>>>>>> Assert.Null(t.KeyContainer); // "KeyContainer should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:"), false / no response file /); <<<<<<< Assert.AreEqual(testParameterValue, t.KeyContainer, "New KeyContainer value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:") + testParameterValue, false / no response file /); ======= Assert.Equal(testParameterValue, t.KeyContainer); // "New KeyContainer value should be set" CommandLine.ValidateHasParameter(t, @"/keycontainer:" + testParameterValue, false / no response file /); >>>>>>> Assert.Equal(testParameterValue, t.KeyContainer); // "New KeyContainer value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:") + testParameterValue, false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.KeyFile, "KeyFile should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:"), false / no response file /); ======= Assert.Null(t.KeyFile); // "KeyFile should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/keyfile:", false / no response file /); >>>>>>> Assert.Null(t.KeyFile); // "KeyFile should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:"), false / no response file /); <<<<<<< Assert.AreEqual(badParameterValue, t.KeyFile, "New KeyFile value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + badParameterValue, false / no response file /); ======= Assert.Equal(badParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter(t, @"/keyfile:" + badParameterValue, false / no response file /); >>>>>>> Assert.Equal(badParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + badParameterValue, false / no response file /); <<<<<<< Assert.AreEqual(goodParameterValue, t.KeyFile, "New KeyFile value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + goodParameterValue, false / no response file /); ======= Assert.Equal(goodParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter(t, @"/keyfile:" + goodParameterValue, false / no response file /); >>>>>>> Assert.Equal(goodParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + goodParameterValue, false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.KeyFile, "KeyFile should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:"), false / no response file /); ======= Assert.Null(t.KeyFile); // "KeyFile should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/keyfile:", false / no response file /); >>>>>>> Assert.Null(t.KeyFile); // "KeyFile should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:"), false / no response file /); <<<<<<< Assert.AreEqual(testParameterValue, t.KeyFile, "New KeyFile value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + testParameterValue, false / no response file /); ======= Assert.Equal(testParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter(t, @"/keyfile:" + testParameterValue, false / no response file /); >>>>>>> Assert.Equal(testParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + testParameterValue, false / no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test]
<<<<<<< using NUnit.Framework; #pragma warning disable 0219 ======= using Xunit; >>>>>>> using Xunit; #pragma warning disable 0219 <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< if (NativeMethodsShared.IsUnixLike) { Assert.Ignore("FileTracker is not supported under Unix"); } s_defaultFileTrackerPathUnquoted = null;//FileTracker.GetFileTrackerPath(ExecutableType.SameAsCurrentProcess); s_defaultFileTrackerPath = null; //"\"" + defaultFileTrackerPathUnquoted + "\""; s_defaultTrackerPath = null;//FileTracker.GetTrackerPath(ExecutableType.SameAsCurrentProcess); ======= s_defaultFileTrackerPathUnquoted = FileTracker.GetFileTrackerPath(ExecutableType.SameAsCurrentProcess); s_defaultFileTrackerPath = "\"" + s_defaultFileTrackerPathUnquoted + "\""; s_defaultTrackerPath = FileTracker.GetTrackerPath(ExecutableType.SameAsCurrentProcess); >>>>>>> if (NativeMethodsShared.IsUnixLike) { Assert.Ignore("FileTracker is not supported under Unix"); } s_defaultFileTrackerPathUnquoted = FileTracker.GetFileTrackerPath(ExecutableType.SameAsCurrentProcess); s_defaultFileTrackerPath = "\"" + s_defaultFileTrackerPathUnquoted + "\""; s_defaultTrackerPath = FileTracker.GetTrackerPath(ExecutableType.SameAsCurrentProcess); <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test]
<<<<<<< [Test] ======= [TestMethod] public void GetApiContractReferencesHandlesNullContracts() { string[] returnValue = ToolLocationHelper.GetApiContractReferences(null, String.Empty); Assert.AreEqual(0, returnValue.Length); } [TestMethod] >>>>>>> [Test] public void GetApiContractReferencesHandlesNullContracts() { string[] returnValue = ToolLocationHelper.GetApiContractReferences(null, String.Empty); Assert.AreEqual(0, returnValue.Length); } [Test] <<<<<<< string platformDirectory = Path.Combine(testDirectoryRoot, "OneCoreSDK", "1.0") + Path.DirectorySeparatorChar; string propsDirectory = Path.Combine( new[] { platformDirectory, "DesignTime", "CommonConfiguration", "Neutral", "MyPlatform", "0.8.0.0" }); ======= string platformDirectory = Path.Combine(testDirectoryRoot, "OneCoreSDK\\1.0\\"); string propsDirectory = Path.Combine(platformDirectory, "DesignTime\\CommonConfiguration\\Neutral\\MyPlatform\\0.8.0.0"); string platformDirectory2 = Path.Combine(platformDirectory, "Platforms", "MyPlatform", "0.8.0.0"); >>>>>>> string platformDirectory = Path.Combine(testDirectoryRoot, "OneCoreSDK", "1.0") + Path.DirectorySeparatorChar; string propsDirectory = Path.Combine( new[] { platformDirectory, "DesignTime", "CommonConfiguration", "Neutral", "MyPlatform", "0.8.0.0" }); string platformDirectory2 = Path.Combine(platformDirectory, "Platforms", "MyPlatform", "0.8.0.0"); <<<<<<< File.WriteAllText(Path.Combine(platformDirectory, "SDKManifest.xml"), "Test"); ======= File.WriteAllText(Path.Combine(platformDirectory, "sdkManifest.xml"), "Test"); File.WriteAllText(Path.Combine(platformDirectory2, "Platform.xml"), "Test"); >>>>>>> File.WriteAllText(Path.Combine(platformDirectory, "SDKManifest.xml"), "Test"); File.WriteAllText(Path.Combine(platformDirectory2, "Platform.xml"), "Test");
<<<<<<< using Microsoft.Build.Shared; using NUnit.Framework; ======= using Xunit; >>>>>>> using Microsoft.Build.Shared; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< property = project.GetProperty(varName); Assert.AreEqual("v", property.UnevaluatedValue); ======= property = project.GetProperty("Username"); Assert.Equal("v", property.UnevaluatedValue); >>>>>>> property = project.GetProperty(varName); Assert.Equal("v", property.UnevaluatedValue); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(true, project.GetProperty(varName).IsEnvironmentProperty); Assert.AreEqual(false, project.GetProperty(varName).IsGlobalProperty); Assert.AreEqual(false, project.GetProperty(varName).IsReservedProperty); Assert.AreEqual(false, project.GetProperty(varName).IsImported); ======= Assert.Equal(true, project.GetProperty("username").IsEnvironmentProperty); Assert.Equal(false, project.GetProperty("username").IsGlobalProperty); Assert.Equal(false, project.GetProperty("username").IsReservedProperty); Assert.Equal(false, project.GetProperty("username").IsImported); >>>>>>> Assert.Equal(true, project.GetProperty(varName).IsEnvironmentProperty); Assert.Equal(false, project.GetProperty(varName).IsGlobalProperty); Assert.Equal(false, project.GetProperty(varName).IsReservedProperty); Assert.Equal(false, project.GetProperty(varName).IsImported); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using Microsoft.Build.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< s_engineResourceManager = new ResourceManager("Microsoft.Build.Resources.Strings", typeof(ProjectCollection).GetTypeInfo().Assembly); ======= s_engineResourceManager = new ResourceManager("Microsoft.Build.Strings", typeof(ProjectCollection).Assembly); >>>>>>> s_engineResourceManager = new ResourceManager("Microsoft.Build.Strings", typeof(ProjectCollection).GetTypeInfo().Assembly);
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [Ignore("FEATURE: TASKHOST")] ======= [Fact] >>>>>>> [Fact(Skip="FEATURE: TASKHOST")] <<<<<<< [Test] [Ignore("FEATURE: TASKHOST")] ======= [Fact] >>>>>>> [Fact(Skip="FEATURE: TASKHOST")]
<<<<<<< using NUnit.Framework; ======= >>>>>>>
<<<<<<< using Microsoft.Build.Shared; using NUnit.Framework; ======= using Xunit; >>>>>>> using Microsoft.Build.Shared; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(1, Helpers.MakeList(itemGroupElement.Items).Count); Assert.AreEqual(true, object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); ======= Assert.Equal(1, Helpers.MakeList(itemGroupElement.Items).Count); Assert.Equal(true, Object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); >>>>>>> Assert.Equal(1, Helpers.MakeList(itemGroupElement.Items).Count); Assert.Equal(true, object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); <<<<<<< Assert.AreEqual(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItems("j")))); Assert.AreEqual(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsIgnoringCondition("j")))); Assert.AreEqual(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsByEvaluatedInclude("i1")))); ======= Assert.Equal(true, Object.ReferenceEquals(item, Helpers.GetFirst(project.GetItems("j")))); Assert.Equal(true, Object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsIgnoringCondition("j")))); Assert.Equal(true, Object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsByEvaluatedInclude("i1")))); >>>>>>> Assert.Equal(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItems("j")))); Assert.Equal(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsIgnoringCondition("j")))); Assert.Equal(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsByEvaluatedInclude("i1")))); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(true, object.ReferenceEquals(itemElement, metadatumElement1.Parent)); ======= Assert.Equal(true, Object.ReferenceEquals(itemElement, metadatumElement1.Parent)); >>>>>>> Assert.Equal(true, object.ReferenceEquals(itemElement, metadatumElement1.Parent)); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(2, Helpers.MakeList(itemGroupElement.Items).Count); Assert.AreEqual(true, object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); Assert.AreEqual(true, object.ReferenceEquals(itemGroupElement, Helpers.GetFirst(project.GetItems("i")).Xml.Parent)); ======= Assert.Equal(2, Helpers.MakeList(itemGroupElement.Items).Count); Assert.Equal(true, Object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); Assert.Equal(true, Object.ReferenceEquals(itemGroupElement, Helpers.GetFirst(project.GetItems("i")).Xml.Parent)); >>>>>>> Assert.Equal(2, Helpers.MakeList(itemGroupElement.Items).Count); Assert.Equal(true, object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); Assert.Equal(true, object.ReferenceEquals(itemGroupElement, Helpers.GetFirst(project.GetItems("i")).Xml.Parent)); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(string.Empty, instance.GetPropertyValue("p1")); Assert.AreEqual(0, Helpers.Count(project.Properties) - environmentPropertyCount); ======= Assert.Equal(String.Empty, instance.GetPropertyValue("p1")); Assert.Equal(0, Helpers.Count(project.Properties) - environmentPropertyCount); >>>>>>> Assert.Equal(String.Empty, instance.GetPropertyValue("p1")); Assert.Equal(0, Helpers.Count(project.Properties) - environmentPropertyCount); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual("m2", items[0].GetMetadataValue("m")); Assert.AreEqual(true, object.ReferenceEquals(metadatum1, metadatum2)); ======= Assert.Equal("m2", items[0].GetMetadataValue("m")); Assert.Equal(true, Object.ReferenceEquals(metadatum1, metadatum2)); >>>>>>> Assert.Equal("m2", items[0].GetMetadataValue("m")); Assert.Equal(true, object.ReferenceEquals(metadatum1, metadatum2)); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(true, object.ReferenceEquals(items[0].Xml, items[1].Xml)); Assert.AreEqual("a;b", items[0].UnevaluatedInclude); ======= Assert.Equal(true, Object.ReferenceEquals(items[0].Xml, items[1].Xml)); Assert.Equal("a;b", items[0].UnevaluatedInclude); >>>>>>> Assert.Equal(true, object.ReferenceEquals(items[0].Xml, items[1].Xml)); Assert.Equal("a;b", items[0].UnevaluatedInclude); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(FileNotFoundException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using System.Collections.Generic; using System.Diagnostics; using System.Globalization; >>>>>>> using System.Collections.Generic; using System.Diagnostics; <<<<<<< else if (normalized.Substring(0, 2) == @"\\") ======= if (normalized.StartsWith(@"\\")) >>>>>>> if (normalized.StartsWith(@"\\"))
<<<<<<< using Microsoft.Build.Shared; ======= using System; using System.Collections.Generic; using System.Text; using System.IO; using System.Reflection; using Microsoft.Build.Framework; >>>>>>> using Microsoft.Build.Shared; <<<<<<< using NUnit.Framework; ======= using System.Text.RegularExpressions; using System.Globalization; using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.GenerateSource, "GenerateSource should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/source"), false /* no response file /); ======= Assert.False(t.GenerateSource); // "GenerateSource should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/source", false / no response file /); >>>>>>> Assert.False(t.GenerateSource); // "GenerateSource should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/source"), false / no response file /); <<<<<<< Assert.IsTrue(t.GenerateSource, "GenerateSource should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/source"), false / no response file /); ======= Assert.True(t.GenerateSource); // "GenerateSource should be true" CommandLine.ValidateHasParameter(t, @"/source", false / no response file /); >>>>>>> Assert.True(t.GenerateSource); // "GenerateSource should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/source"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.Silent, "Silent should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false / no response file /); ======= Assert.False(t.Silent); // "Silent should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/silent", false / no response file /); >>>>>>> Assert.False(t.Silent); // "Silent should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false / no response file /); <<<<<<< Assert.IsTrue(t.Silent, "Silent should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false / no response file /); ======= Assert.True(t.Silent); // "Silent should be true" CommandLine.ValidateHasParameter(t, @"/silent", false / no response file /); >>>>>>> Assert.True(t.Silent); // "Silent should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.Verbose, "Verbose should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false / no response file /); ======= Assert.False(t.Verbose); // "Verbose should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/verbose", false / no response file /); >>>>>>> Assert.False(t.Verbose); // "Verbose should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false / no response file /); <<<<<<< Assert.IsTrue(t.Verbose, "Verbose should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false / no response file /); ======= Assert.True(t.Verbose); // "Verbose should be true" CommandLine.ValidateHasParameter(t, @"/verbose", false / no response file /); >>>>>>> Assert.True(t.Verbose); // "Verbose should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false / no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using System.Text; using Microsoft.Build.BackEnd.Logging; ======= using System.Collections.Generic; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; >>>>>>> using System.Collections.Generic; using System.Text; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Execution; using Microsoft.Build.Framework; <<<<<<< using Shouldly; ======= using Shouldly; >>>>>>> using Shouldly;
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< NativeMethodsShared.ThrowExceptionForErrorCode(errorCode); return null; } #endif return FixFilePath(Path.GetFullPath(path)); } internal static string FixFilePath(string path) { return string.IsNullOrEmpty(path) \|\| Path.DirectorySeparatorChar == '\\' ? path : path.Replace('\\', '/');//.Replace("//", "/"); } /// <summary> /// If on Unix, convert backslashes to slashes for strings that resemble paths. /// The heuristic is if something resembles paths (contains slashes) check if the /// first segment exists and is a directory. /// Use a native shared method to massage file path. If the file is adjusted, /// that qualifies is as a path. /// </summary> internal static string MaybeAdjustFilePath(string value) { // Don't bother with arrays or properties or network paths, or those that // have no slashes. if (NativeMethodsShared.IsWindows \|\| string.IsNullOrEmpty(value) \|\| value.StartsWith("$(") \|\| value.StartsWith("@(") \|\| value.StartsWith("\\\\") \|\| value.IndexOfAny(new[] { '/', '\\' }) == -1) { return value; } // For Unix-like systems, we may want to convert backslashes to slashes string newValue = Regex.Replace(value, @"[\\/]+", "/"); string quote = string.Empty; // Find the part of the name we want to check, that is remove quotes, if present string checkValue = newValue; if (newValue.Length > 2) { if (newValue.StartsWith("'")) { if (newValue.EndsWith("'")) ======= /* From Path.cs in the CLR Throw an ArgumentException for paths like \\, \\server, \\server\ This check can only be properly done after normalizing, so \\foo\.. will be properly rejected. Also, reject \\?\GLOBALROOT\ (an internal kernel path) because it provides aliases for drives. throw new ArgumentException(Environment.GetResourceString("Arg_PathIllegalUNC")); // Check for \\?\Globalroot, an internal mechanism to the kernel // that provides aliases for drives and other undocumented stuff. // The kernel team won't even describe the full set of what // is available here - we don't want managed apps mucking // with this for security reasons. */ if (startIndex == finalFullPath.Length \|\| finalFullPath.IndexOf(@"\\?\globalroot", PathComparison) != -1) >>>>>>> NativeMethodsShared.ThrowExceptionForErrorCode(errorCode); return null; } #endif return FixFilePath(Path.GetFullPath(path)); } internal static string FixFilePath(string path) { return string.IsNullOrEmpty(path) \|\| Path.DirectorySeparatorChar == '\\' ? path : path.Replace('\\', '/');//.Replace("//", "/"); } /// <summary> /// If on Unix, convert backslashes to slashes for strings that resemble paths. /// The heuristic is if something resembles paths (contains slashes) check if the /// first segment exists and is a directory. /// Use a native shared method to massage file path. If the file is adjusted, /// that qualifies is as a path. /// </summary> internal static string MaybeAdjustFilePath(string value) { // Don't bother with arrays or properties or network paths, or those that // have no slashes. if (NativeMethodsShared.IsWindows \|\| string.IsNullOrEmpty(value) \|\| value.StartsWith("$(") \|\| value.StartsWith("@(") \|\| value.StartsWith("\\\\") \|\| value.IndexOfAny(new[] { '/', '\\' }) == -1) { return value; } // For Unix-like systems, we may want to convert backslashes to slashes string newValue = Regex.Replace(value, @"[\\/]+", "/"); string quote = string.Empty; // Find the part of the name we want to check, that is remove quotes, if present string checkValue = newValue; if (newValue.Length > 2) { if (newValue.StartsWith("'")) { if (newValue.EndsWith("'")) <<<<<<< internal static StreamWriter OpenWrite(string path, bool append, Encoding encoding = null) { const int DefaultFileStreamBufferSize = 4096; FileMode mode = append ? FileMode.Append : FileMode.Create; Stream fileStream = new FileStream(path, mode, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamWriter(fileStream); } else { return new StreamWriter(fileStream, encoding); } } internal static StreamReader OpenRead(string path, Encoding encoding = null, bool detectEncodingFromByteOrderMarks = true) { const int DefaultFileStreamBufferSize = 4096; Stream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamReader(fileStream); } else { return new StreamReader(fileStream, encoding, detectEncodingFromByteOrderMarks); } } ======= internal static string TrimTrailingSlashes(this string s) { return s.TrimEnd('/', '\\'); } /// <summary> /// Replace all backward slashes to forward slashes /// </summary> internal static string ToSlash(this string s) { return s.Replace('\\', '/'); } internal static string NormalizeForPathComparison(this string s) => s.ToSlash().TrimTrailingSlashes(); internal static bool PathsEqual(string path1, string path2) { var trim1 = path1.TrimTrailingSlashes(); var trim2 = path2.TrimTrailingSlashes(); if (string.Equals(trim1, trim2, PathComparison)) { return true; } var slash1 = trim1.ToSlash(); var slash2 = trim2.ToSlash(); return string.Equals(slash1, slash2, PathComparison); } >>>>>>> internal static string TrimTrailingSlashes(this string s) { return s.TrimEnd('/', '\\'); } /// <summary> /// Replace all backward slashes to forward slashes /// </summary> internal static string ToSlash(this string s) { return s.Replace('\\', '/'); } internal static string NormalizeForPathComparison(this string s) => s.ToSlash().TrimTrailingSlashes(); internal static bool PathsEqual(string path1, string path2) { var trim1 = path1.TrimTrailingSlashes(); var trim2 = path2.TrimTrailingSlashes(); if (string.Equals(trim1, trim2, PathComparison)) { return true; } var slash1 = trim1.ToSlash(); var slash2 = trim2.ToSlash(); return string.Equals(slash1, slash2, PathComparison); } internal static StreamWriter OpenWrite(string path, bool append, Encoding encoding = null) { const int DefaultFileStreamBufferSize = 4096; FileMode mode = append ? FileMode.Append : FileMode.Create; Stream fileStream = new FileStream(path, mode, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamWriter(fileStream); } else { return new StreamWriter(fileStream, encoding); } } internal static StreamReader OpenRead(string path, Encoding encoding = null, bool detectEncodingFromByteOrderMarks = true) { const int DefaultFileStreamBufferSize = 4096; Stream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamReader(fileStream); } else { return new StreamReader(fileStream, encoding, detectEncodingFromByteOrderMarks); } }
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using System.Xml; using Microsoft.Build.BackEnd; >>>>>>> using System.Xml; using Microsoft.Build.BackEnd; <<<<<<< [TestFixture] public class TaskRegistry_Tests ======= public class TaskRegistry_Tests : IClassFixture<TaskAssemblyFixture> >>>>>>> public class TaskRegistry_Tests : IClassFixture<TaskAssemblyFixture> <<<<<<< /// Set up this test class -- generate the test task assembly used by /// several of the tests. /// </summary> [TestFixtureSetUp] public static void SetupClass() { s_testTaskLocation = GetTestTaskAssemblyLocation(); } /// <summary> /// Clean this test class up -- make sure the test task assembly we /// generated has been deleted. /// </summary> [TestFixtureTearDown] public static void CleanupClass() { if (File.Exists(s_testTaskLocation)) { FileUtilities.DeleteNoThrow(s_testTaskLocation); } } /// <summary> ======= >>>>>>> <<<<<<< [SetUp] public void SetUp() ======= public TaskRegistry_Tests(TaskAssemblyFixture fixture) >>>>>>> public TaskRegistry_Tests(TaskAssemblyFixture fixture) <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask);
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< var info0 = ProcessCode(analyser, snippet0, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); var info1 = ProcessCode(analyser, snippet1, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); ======= var info = ProcessCode(analyser, sampleProgram, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); Assert.AreEqual(1, info.Allocations.Count(d => d.Id == ConcatenationAllocationAnalyzer.ValueTypeToReferenceTypeInAStringConcatenationRule.Id)); Assert.AreEqual(4, info.Allocations.Count(d => d.Id == ConcatenationAllocationAnalyzer.StringConcatenationAllocationRule.Id)); >>>>>>> var info0 = ProcessCode(analyser, snippet0, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); var info1 = ProcessCode(analyser, snippet1, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); Assert.AreEqual(1, info.Allocations.Count(d => d.Id == ConcatenationAllocationAnalyzer.ValueTypeToReferenceTypeInAStringConcatenationRule.Id)); Assert.AreEqual(4, info.Allocations.Count(d => d.Id == ConcatenationAllocationAnalyzer.StringConcatenationAllocationRule.Id));
<<<<<<< using Xunit; ======= using System.Text; >>>>>>> using Xunit; using System.Text; <<<<<<< ======= #endif >>>>>>> #endif <<<<<<< Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); doc.Load(_pathToCommonTargets); doc.Save(new MemoryStream()); } ); ======= var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } #endif doc.Save(new MemoryStream()); >>>>>>> Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } #endif doc.Save(new MemoryStream()); } ); <<<<<<< Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); doc.Load(_pathToCommonTargets); doc.Save(new StringWriter()); } ); ======= var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } #endif doc.Save(new StringWriter()); >>>>>>> Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } #endif doc.Save(new StringWriter()); } ); <<<<<<< Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); doc.Load(_pathToCommonTargets); doc.Save(XmlWriter.Create(FileUtilities.GetTemporaryFile())); } ); ======= var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); doc.Save(XmlWriter.Create(FileUtilities.GetTemporaryFile())); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } using (XmlWriter wr = XmlWriter.Create(new FileStream(FileUtilities.GetTemporaryFile(), FileMode.Create))) { doc.Save(wr); } #endif >>>>>>> Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); doc.Save(XmlWriter.Create(FileUtilities.GetTemporaryFile())); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } using (XmlWriter wr = XmlWriter.Create(new FileStream(FileUtilities.GetTemporaryFile(), FileMode.Create))) { doc.Save(wr); } #endif } );
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using System.Reflection; using System.Globalization; >>>>>>> <<<<<<< using NUnit.Framework; ======= using Microsoft.Build.Shared; using Xunit; >>>>>>> using Microsoft.Build.Shared; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(FileUtilities.FixFilePath(@"fr\RootNamespace.SubFolder.SplashScreen.bmp"), result); ======= Assert.Equal(@"fr\RootNamespace.SubFolder.SplashScreen.bmp", result); >>>>>>> Assert.Equal(FileUtilities.FixFilePath(@"fr\RootNamespace.SubFolder.SplashScreen.bmp"), result); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using Microsoft.Build.Framework; >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< if (NativeMethodsShared.IsUnixLike) { Assert.Ignore("File names under Unix are case-sensitive and this test is not useful"); } string currdir = Environment.CurrentDirectory; ======= string currdir = Directory.GetCurrentDirectory(); >>>>>>> if (NativeMethodsShared.IsUnixLike) { Assert.Ignore("File names under Unix are case-sensitive and this test is not useful"); } string currdir = Directory.GetCurrentDirectory();
<<<<<<< [Test] ======= /// </summary> [TestMethod] >>>>>>> /// </summary> [Test]
<<<<<<< else if (_panelProfileHandler.Airframe == DCSAirframe.M2000C) { var radioPanelPZ69UserControl = new RadioPanelPZ69UserControlM2000C(hidSkeleton, tabItem, this); _saitekUserControls.Add(radioPanelPZ69UserControl); _panelProfileHandler.Attach(radioPanelPZ69UserControl); tabItem.Content = radioPanelPZ69UserControl; TabControlPanels.Items.Add(tabItem); } ======= //else if (_panelProfileHandler.Airframe == DCSAirframe.F5E) //{ // var radioPanelPZ69UserControl = new RadioPanelPZ69UserControlF5E(hidSkeleton, tabItem, this); // _saitekUserControls.Add(radioPanelPZ69UserControl); // _panelProfileHandler.Attach(radioPanelPZ69UserControl); // tabItem.Content = radioPanelPZ69UserControl; // TabControlPanels.Items.Add(tabItem); //} >>>>>>> else if (_panelProfileHandler.Airframe == DCSAirframe.M2000C) { var radioPanelPZ69UserControl = new RadioPanelPZ69UserControlM2000C(hidSkeleton, tabItem, this); _saitekUserControls.Add(radioPanelPZ69UserControl); _panelProfileHandler.Attach(radioPanelPZ69UserControl); tabItem.Content = radioPanelPZ69UserControl; TabControlPanels.Items.Add(tabItem); } //else if (_panelProfileHandler.Airframe == DCSAirframe.F5E) //{ // var radioPanelPZ69UserControl = new RadioPanelPZ69UserControlF5E(hidSkeleton, tabItem, this); // _saitekUserControls.Add(radioPanelPZ69UserControl); // _panelProfileHandler.Attach(radioPanelPZ69UserControl); // tabItem.Content = radioPanelPZ69UserControl; // TabControlPanels.Items.Add(tabItem); //}
<<<<<<< RegexOptions.IgnoreCase ); /* var matches = Regex.Matches(currentLine, "(?<File>.):(?<Line>\\d+):(?<Character>\\d+):(?<Type> error\| warning):(?<Message>.)"); / static private Regex s_originCategoryCodeTextExpression2 = new Regex ( @"^\s(?<ORIGIN>(?<FILENAME>.):(?<LOCATION>(?<LINE>[0-9]):(?<COLUMN>[0-9]))):(?<CATEGORY> error\| warning):(?<TEXT>.)", RegexOptions.IgnoreCase ); ======= RegexOptions.IgnoreCase \| RegexOptions.Compiled )); >>>>>>> RegexOptions.IgnoreCase \| RegexOptions.Compiled )); private static readonly Lazy<Regex> s_originCategoryCodeTextExpression2 = new Lazy<Regex>( () => new Regex ( @"^\s(?<ORIGIN>(?<FILENAME>.):(?<LOCATION>(?<LINE>[0-9]):(?<COLUMN>[0-9]))):(?<CATEGORY> error\| warning):(?<TEXT>.*)", RegexOptions.IgnoreCase \| RegexOptions.Compiled )); <<<<<<< Match match = s_originCategoryCodeTextExpression.Match(message); string category; ======= Match match = s_originCategoryCodeTextExpression.Value.Match(message); >>>>>>> Match match = s_originCategoryCodeTextExpression.Value.Match(message); string category;
<<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] public class Preprocessor_Tests ======= public class Preprocessor_Tests : IDisposable >>>>>>> public class Preprocessor_Tests : IDisposable <<<<<<< [SetUp] ======= >>>>>>> <<<<<<< [TearDown] public void Teardown() ======= public void Dispose() >>>>>>> public void Dispose() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using System.IO; ======= >>>>>>> using System.IO; <<<<<<< using NUnit.Framework; ======= using Microsoft.Build.Shared; using Xunit; >>>>>>> using Xunit; <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using System.Reflection; using Microsoft.Build.Framework; >>>>>>> using System.Reflection; using Microsoft.Build.Framework; <<<<<<< using NUnit.Framework; ======= using System.Text.RegularExpressions; using System.Globalization; using Xunit; >>>>>>> using System.Text.RegularExpressions; using System.Globalization; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual("Agnostic", t.Machine, "New TypeLibName value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch("/machine:Agnostic"), false /* no response file /); ======= Assert.Equal("Agnostic", t.Machine); // "New TypeLibName value should be set" CommandLine.ValidateHasParameter(t, "/machine:Agnostic", false / no response file /); >>>>>>> Assert.Equal("Agnostic", t.Machine); // "New TypeLibName value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch("/machine:Agnostic"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.AssemblyNamespace, "AssemblyNamespace should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/namespace:"), false / no response file /); ======= Assert.Null(t.AssemblyNamespace); // "AssemblyNamespace should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/namespace:", false / no response file /); >>>>>>> Assert.Null(t.AssemblyNamespace); // "AssemblyNamespace should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/namespace:"), false / no response file /); <<<<<<< Assert.AreEqual(testParameterValue, t.AssemblyNamespace, "New AssemblyNamespace value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/namespace:") + testParameterValue, false / no response file /); ======= Assert.Equal(testParameterValue, t.AssemblyNamespace); // "New AssemblyNamespace value should be set" CommandLine.ValidateHasParameter(t, @"/namespace:" + testParameterValue, false / no response file /); >>>>>>> Assert.Equal(testParameterValue, t.AssemblyNamespace); // "New AssemblyNamespace value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/namespace:") + testParameterValue, false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.AssemblyVersion, "AssemblyVersion should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/asmversion:"), false / no response file /); ======= Assert.Null(t.AssemblyVersion); // "AssemblyVersion should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/asmversion:", false / no response file /); >>>>>>> Assert.Null(t.AssemblyVersion); // "AssemblyVersion should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/asmversion:"), false / no response file /); <<<<<<< Assert.AreEqual(testParameterValue, t.AssemblyVersion, "New AssemblyNamespace value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/asmversion:") + testParameterValue.ToString(), false / no response file /); ======= Assert.Equal(testParameterValue, t.AssemblyVersion); // "New AssemblyNamespace value should be set" CommandLine.ValidateHasParameter(t, @"/asmversion:" + testParameterValue.ToString(), false / no response file /); >>>>>>> Assert.Equal(testParameterValue, t.AssemblyVersion); // "New AssemblyNamespace value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/asmversion:") + testParameterValue.ToString(), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.NoLogo, "NoLogo should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/nologo"), false / no response file /); ======= Assert.False(t.NoLogo); // "NoLogo should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/nologo", false / no response file /); >>>>>>> Assert.False(t.NoLogo); // "NoLogo should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/nologo"), false / no response file /); <<<<<<< Assert.IsTrue(t.NoLogo, "NoLogo should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/nologo"), false / no response file /); ======= Assert.True(t.NoLogo); // "NoLogo should be true" CommandLine.ValidateHasParameter(t, @"/nologo", false / no response file /); >>>>>>> Assert.True(t.NoLogo); // "NoLogo should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/nologo"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.PreventClassMembers, "PreventClassMembers should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/noclassmembers"), false / no response file /); ======= Assert.False(t.PreventClassMembers); // "PreventClassMembers should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/noclassmembers", false / no response file /); >>>>>>> Assert.False(t.PreventClassMembers); // "PreventClassMembers should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/noclassmembers"), false / no response file /); <<<<<<< Assert.IsTrue(t.PreventClassMembers, "PreventClassMembers should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/noclassmembers"), false / no response file /); ======= Assert.True(t.PreventClassMembers); // "PreventClassMembers should be true" CommandLine.ValidateHasParameter(t, @"/noclassmembers", false / no response file /); >>>>>>> Assert.True(t.PreventClassMembers); // "PreventClassMembers should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/noclassmembers"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.SafeArrayAsSystemArray, "SafeArrayAsSystemArray should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/sysarray"), false / no response file /); ======= Assert.False(t.SafeArrayAsSystemArray); // "SafeArrayAsSystemArray should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/sysarray", false / no response file /); >>>>>>> Assert.False(t.SafeArrayAsSystemArray); // "SafeArrayAsSystemArray should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/sysarray"), false / no response file /); <<<<<<< Assert.IsTrue(t.SafeArrayAsSystemArray, "SafeArrayAsSystemArray should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/sysarray"), false / no response file /); ======= Assert.True(t.SafeArrayAsSystemArray); // "SafeArrayAsSystemArray should be true" CommandLine.ValidateHasParameter(t, @"/sysarray", false / no response file /); >>>>>>> Assert.True(t.SafeArrayAsSystemArray); // "SafeArrayAsSystemArray should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/sysarray"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.Silent, "Silent should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false / no response file /); ======= Assert.False(t.Silent); // "Silent should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/silent", false / no response file /); >>>>>>> Assert.False(t.Silent); // "Silent should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false / no response file /); <<<<<<< Assert.IsTrue(t.Silent, "Silent should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false / no response file /); ======= Assert.True(t.Silent); // "Silent should be true" CommandLine.ValidateHasParameter(t, @"/silent", false / no response file /); >>>>>>> Assert.True(t.Silent); // "Silent should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(ResolveComReference.TlbImpTransformFlags.None, t.Transform, "Transform should be TlbImpTransformFlags.None by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:"), false / no response file /); ======= Assert.Equal(ResolveComReference.TlbImpTransformFlags.None, t.Transform); // "Transform should be TlbImpTransformFlags.None by default" CommandLine.ValidateNoParameterStartsWith(t, @"/transform:", false / no response file /); >>>>>>> Assert.Equal(ResolveComReference.TlbImpTransformFlags.None, t.Transform); // "Transform should be TlbImpTransformFlags.None by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:"), false / no response file /); <<<<<<< Assert.AreEqual(dispRet, t.Transform, "New Transform value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:DispRet"), false / no response file /); ======= Assert.Equal(dispRet, t.Transform); // "New Transform value should be set" CommandLine.ValidateHasParameter(t, @"/transform:DispRet", false / no response file /); >>>>>>> Assert.Equal(dispRet, t.Transform); // "New Transform value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:DispRet"), false / no response file /); <<<<<<< Assert.AreEqual(serialize, t.Transform, "New Transform value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:SerializableValueClasses"), false / no response file /); ======= Assert.Equal(serialize, t.Transform); // "New Transform value should be set" CommandLine.ValidateHasParameter(t, @"/transform:SerializableValueClasses", false / no response file /); >>>>>>> Assert.Equal(serialize, t.Transform); // "New Transform value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:SerializableValueClasses"), false / no response file /); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.Verbose, "Verbose should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false / no response file /); ======= Assert.False(t.Verbose); // "Verbose should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/verbose", false / no response file /); >>>>>>> Assert.False(t.Verbose); // "Verbose should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false / no response file /); <<<<<<< Assert.IsTrue(t.Verbose, "Verbose should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false / no response file /); ======= Assert.True(t.Verbose); // "Verbose should be true" CommandLine.ValidateHasParameter(t, @"/verbose", false / no response file /); >>>>>>> Assert.True(t.Verbose); // "Verbose should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false / no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using System.Text; >>>>>>> using System.Text; <<<<<<< using System.Text; ======= >>>>>>> <<<<<<< using (StreamWriter sw = new StreamWriter(_batchFile, false, isUnix ? Encoding.ASCII : EncodingUtilities.CurrentSystemOemEncoding)) // HIGHCHAR: Exec task batch files are in OEM code pages (not ANSI!) { if (!isUnix) ======= // Note: 8/12/15 - Switched to use UTF8 on OS newer than 6.1 (Windows 7) using (StreamWriter sw = new StreamWriter(_batchFile, false, GetEncodingWithOsFallback())) { // In some wierd setups, users may have set an env var actually called "errorlevel" // this would cause our "exit %errorlevel%" to return false. // This is because the actual errorlevel value is not an environment variable, but some commands, // such as "exit %errorlevel%" will use the environment variable with that name if it exists, instead // of the actual errorlevel value. So we must temporarily reset errorlevel locally first. sw.WriteLine("setlocal"); // One more wrinkle. // "set foo=" has odd behavior: it sets errorlevel to 1 if there was no environment variable named // "foo" defined. // This has the effect of making "set errorlevel=" set an errorlevel of 1 if an environment // variable named "errorlevel" didn't already exist! // To avoid this problem, set errorlevel locally to a dummy value first. sw.WriteLine("set errorlevel=dummy"); sw.WriteLine("set errorlevel="); // We probably have to change the code page to UTF8 (65001) for non-ansi characters to work. if (EncodingUtilities.CurrentSystemOemEncoding.CodePage != sw.Encoding.CodePage) { // Output to nul so we don't change output and logs. sw.WriteLine(string.Format("chcp {0}>nul", sw.Encoding.CodePage)); } // if the working directory is a UNC path, bracket the exec command with pushd and popd, because pushd // automatically maps the network path to a drive letter, and then popd disconnects it if (workingDirectoryIsUNC) >>>>>>> // Note: 8/12/15 - Switched to use UTF8 on OS newer than 6.1 (Windows 7) using (StreamWriter sw = new StreamWriter(_batchFile, false, GetEncodingWithOsFallback())) { if (!isUnix)
<<<<<<< ======= using System.Configuration; using System.IO; using System.Xml; >>>>>>> using System.Configuration; using System.IO; using System.Xml; <<<<<<< using NUnit.Framework; ======= using Microsoft.Build.Unittest; using Xunit; >>>>>>> using Microsoft.Build.Unittest; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [Ignore] ======= [Fact(Skip = "Ignored in MSTest")] >>>>>>> [Fact(Skip = "Ignored in MSTest")] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< private static readonly ResourceManager s_resources = new ResourceManager("Microsoft.Build.Resources.Strings", typeof(AssemblyResources).GetTypeInfo().Assembly); ======= private static readonly ResourceManager s_resources = new ResourceManager("Microsoft.Build.Strings", Assembly.GetExecutingAssembly()); >>>>>>> private static readonly ResourceManager s_resources = new ResourceManager("Microsoft.Build.Strings", typeof(AssemblyResources).GetTypeInfo().Assembly); <<<<<<< private static readonly ResourceManager s_sharedResources = new ResourceManager("Microsoft.Build.Resources.Strings.shared", typeof(AssemblyResources).GetTypeInfo().Assembly); ======= private static readonly ResourceManager s_sharedResources = new ResourceManager("Microsoft.Build.Strings.shared", Assembly.GetExecutingAssembly()); >>>>>>> private static readonly ResourceManager s_sharedResources = new ResourceManager("Microsoft.Build.Strings.shared", typeof(AssemblyResources).GetTypeInfo().Assembly);
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] public void SimpleValidArguments() ======= [Fact] public void SimpleValidArgumentsCommandLine() >>>>>>> [Fact] public void SimpleValidArgumentsCommandLine() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using System.IO; using Xunit; ======= >>>>>>> using System.IO; using Xunit; <<<<<<< Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration(1, Directory.GetCurrentDirectory(), null, Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, null, 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, null, @"c:\my tasks\mytask.dll", null); } ); ======= TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, null, #if FEATURE_ASSEMBLY_LOADFROM @"c:\my tasks\mytask.dll", #else new AssemblyName("mytask"), #endif null); >>>>>>> Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, null, #if FEATURE_ASSEMBLY_LOADFROM @"c:\my tasks\mytask.dll", #else new AssemblyName("mytask"), #endif null); } ); <<<<<<< Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration(1, Directory.GetCurrentDirectory(), null, Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, null, 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, String.Empty, @"c:\my tasks\mytask.dll", null); } ); ======= TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, String.Empty, #if FEATURE_ASSEMBLY_LOADFROM @"c:\my tasks\mytask.dll", #else new AssemblyName("mytask"), #endif null); >>>>>>> Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, String.Empty, #if FEATURE_ASSEMBLY_LOADFROM @"c:\my tasks\mytask.dll", #else new AssemblyName("mytask"), #endif null); } ); <<<<<<< Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration(1, Directory.GetCurrentDirectory(), null, Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, null, 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", null, null); } ); ======= TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", null, null); >>>>>>> Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", null, null); } ); <<<<<<< Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration(1, Directory.GetCurrentDirectory(), null, Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, null, 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", String.Empty, null); } ); ======= TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", #if FEATURE_ASSEMBLY_LOADFROM String.Empty, #else new AssemblyName(String.Empty), #endif null); >>>>>>> Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", #if FEATURE_ASSEMBLY_LOADFROM String.Empty, #else new AssemblyName(String.Empty), #endif null); } ); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.Null(deserializedConfig.TaskParameters); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNull(deserializedConfig.TaskParameters); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.Null(deserializedConfig.TaskParameters); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNotNull(deserializedConfig.TaskParameters); Assert.AreEqual(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); Assert.Equal(config.TaskParameters["Text"].WrappedParameter, deserializedConfig.TaskParameters["Text"].WrappedParameter); Assert.Equal(config.TaskParameters["BoolValue"].WrappedParameter, deserializedConfig.TaskParameters["BoolValue"].WrappedParameter); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNotNull(deserializedConfig.TaskParameters); Assert.AreEqual(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); Assert.AreEqual(config.TaskParameters["Text"].WrappedParameter, deserializedConfig.TaskParameters["Text"].WrappedParameter); Assert.AreEqual(config.TaskParameters["BoolValue"].WrappedParameter, deserializedConfig.TaskParameters["BoolValue"].WrappedParameter); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); Assert.Equal(config.TaskParameters["Text"].WrappedParameter, deserializedConfig.TaskParameters["Text"].WrappedParameter); Assert.Equal(config.TaskParameters["BoolValue"].WrappedParameter, deserializedConfig.TaskParameters["BoolValue"].WrappedParameter); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNotNull(deserializedConfig.TaskParameters); Assert.AreEqual(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNotNull(deserializedConfig.TaskParameters); Assert.AreEqual(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count);
<<<<<<< internal static string dotNetFrameworkVersionFolderPrefixV30 = NativeMethodsShared.IsWindows ? "v3.0" : "3.0"; // v3.0 is for WinFx. private const string dotNetFrameworkVersionV30 = "v3.0"; // full WinFx version to pass to NativeMethodsShared.GetRequestedRuntimeInfo(). private static string s_dotNetFrameworkAssemblyFoldersRegistryKeyV30 = dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30; private static string s_dotNetFrameworkRegistryKeyV30 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30 + "\\Setup"; ======= internal const string dotNetFrameworkVersionFolderPrefixV30 = "v3.0"; // v3.0 is for WinFx. private const string dotNetFrameworkRegistryKeyV30 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30 + "\\Setup"; >>>>>>> internal static string dotNetFrameworkVersionFolderPrefixV30 = NativeMethodsShared.IsWindows ? "v3.0" : "3.0"; // v3.0 is for WinFx. private static string s_dotNetFrameworkRegistryKeyV30 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30 + "\\Setup"; <<<<<<< if (NativeMethodsShared.IsWindows) { var endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith( Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal); ======= bool endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith("\\", StringComparison.Ordinal); >>>>>>> if (NativeMethodsShared.IsWindows) { var endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith( Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal); <<<<<<< if (NativeMethodsShared.IsWindows) { bool endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith( "\\", StringComparison.Ordinal); ======= bool endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith("\\", StringComparison.Ordinal); >>>>>>> if (NativeMethodsShared.IsWindows) { bool endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith( "\\", StringComparison.Ordinal); <<<<<<< /// <param name="directoryExists">Function that checks if directory exists.</param> ======= /// <param name="directoryExists">Delegate to method that can check for the existence of a file.</param> >>>>>>> /// <param name="directoryExists">Function that checks if directory exists.</param> <<<<<<< /// <param name="architecture">Required architecture.</param> ======= /// <param name="architecture">.NET framework architecture</param> >>>>>>> /// <param name="architecture">.NET framework architecture</param> <<<<<<< // Record whether we had a slash or not so that we can tack it back on if necessary var endedWithASlash = path.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal) \|\| path.EndsWith( Path.AltDirectorySeparatorChar.ToString(), StringComparison.Ordinal); ======= bool endedWithASlash = path.EndsWith("\\", StringComparison.OrdinalIgnoreCase); >>>>>>> // Record whether we had a slash or not so that we can tack it back on if necessary var endedWithASlash = path.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal) \|\| path.EndsWith( Path.AltDirectorySeparatorChar.ToString(), StringComparison.Ordinal); <<<<<<< protected string pathToWindowsSdk; #endif ======= private string _pathToWindowsSdk; >>>>>>> private string _pathToWindowsSdk; #endif <<<<<<< if (NativeMethodsShared.IsWindows) ======= if (!CheckForFrameworkInstallation(this._dotNetFrameworkRegistryKey, this._dotNetFrameworkSetupRegistryInstalledName)) >>>>>>> if (NativeMethodsShared.IsWindows) <<<<<<< // Fallback mechanisms. // Try to find explicit fallback rule. // i.e. v4.5.1 on VS12 fallbacks to v4.5 on VS12. bool foundExplicitRule = false; for (int i = 0; i < s_explicitFallbackRulesForPathToDotNetFrameworkSdkTools.GetLength(0); ++i) ======= var trigger = s_explicitFallbackRulesForPathToDotNetFrameworkSdkTools[i, 0]; if (trigger.Item1 == this.Version && trigger.Item2 == visualStudioSpec.Version) >>>>>>> // Fallback mechanisms. // Try to find explicit fallback rule. // i.e. v4.5.1 on VS12 fallbacks to v4.5 on VS12. bool foundExplicitRule = false; for (int i = 0; i < s_explicitFallbackRulesForPathToDotNetFrameworkSdkTools.GetLength(0); ++i) <<<<<<< int index = Array.IndexOf(s_visualStudioSpecs, visualStudioSpec); if (index > 0) { // The items in the array "visualStudioSpecs" must be ordered by version. That would allow us to fallback to the previous visual studio version easily. VisualStudioSpec fallbackVisualStudioSpec = s_visualStudioSpecs[index - 1]; generatedPathToDotNetFrameworkSdkTools = FallbackToPathToDotNetFrameworkSdkToolsInPreviousVersion( this.version, fallbackVisualStudioSpec.Version); } ======= // The items in the array "visualStudioSpecs" must be ordered by version. That would allow us to fallback to the previous visual studio version easily. VisualStudioSpec fallbackVisualStudioSpec = s_visualStudioSpecs[index - 1]; generatedPathToDotNetFrameworkSdkTools = FallbackToPathToDotNetFrameworkSdkToolsInPreviousVersion(this.Version, fallbackVisualStudioSpec.Version); >>>>>>> int index = Array.IndexOf(s_visualStudioSpecs, visualStudioSpec); if (index > 0) { // The items in the array "visualStudioSpecs" must be ordered by version. That would allow us to fallback to the previous visual studio version easily. VisualStudioSpec fallbackVisualStudioSpec = s_visualStudioSpecs[index - 1]; generatedPathToDotNetFrameworkSdkTools = FallbackToPathToDotNetFrameworkSdkToolsInPreviousVersion( this.version, fallbackVisualStudioSpec.Version); } <<<<<<< #if FEATURE_WIN32_REGISTRY if (this.pathToWindowsSdk == null) ======= if (this._pathToWindowsSdk == null) >>>>>>> #if FEATURE_WIN32_REGISTRY if (this._pathToWindowsSdk == null) <<<<<<< return this.pathToWindowsSdk; #else return null; #endif ======= return this._pathToWindowsSdk; >>>>>>> return this._pathToWindowsSdk; #else return null; #endif <<<<<<< #if FEATURE_WIN32_REGISTRY this.pathToDotNetFrameworkReferenceAssemblies = FindRegistryValueUnderKey( dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + this.dotNetFrameworkFolderPrefix, ======= this._pathToDotNetFrameworkReferenceAssemblies = FindRegistryValueUnderKey( dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + this.DotNetFrameworkFolderPrefix, >>>>>>> #if FEATURE_WIN32_REGISTRY this._pathToDotNetFrameworkReferenceAssemblies = FindRegistryValueUnderKey( dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + this.dotNetFrameworkFolderPrefix,
<<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test]
<<<<<<< using System.Reflection; ======= using Microsoft.Build.Internal; >>>>>>> using Microsoft.Build.Internal; using System.Reflection;
<<<<<<< internal static HandshakeOptions GetHandshakeOptions(bool taskHost, bool is64Bit = false, int clrVersion = 0, bool nodeReuse = false, bool lowPriority = false, bool workerNode = true, IDictionary<string, string> taskHostParameters = null) ======= internal static HandshakeOptions GetHandshakeOptions(bool taskHost, bool is64Bit = false, bool nodeReuse = false, bool lowPriority = false, IDictionary<string, string> taskHostParameters = null) >>>>>>> internal static HandshakeOptions GetHandshakeOptions(bool taskHost, bool is64Bit = false, bool nodeReuse = false, bool lowPriority = false, bool workerNode = true, IDictionary<string, string> taskHostParameters = null) <<<<<<< internal static string GetRARPipeName(bool nodeReuse, bool lowPriority) { var context = HandshakeOptions.None; var userName = Environment.UserName; var clrVersion = typeof(bool).GetTypeInfo().Assembly.GetName().Version.Major; var is64Bit = XMakeAttributes.GetCurrentMSBuildArchitecture().Equals(XMakeAttributes.MSBuildArchitectureValues.x64); if (is64Bit) { context \|= HandshakeOptions.X64; } if (clrVersion == 2) { context \|= HandshakeOptions.CLR2; } if (nodeReuse) { context \|= HandshakeOptions.NodeReuse; } if (lowPriority) { context \|= HandshakeOptions.LowPriority; } return $"MSBuild.RAR.{userName}.{(int)context}"; } ======= internal static int AvoidEndOfHandshakeSignal(int x) { return x == EndOfHandshakeSignal ? ~x : x; } >>>>>>> internal static int AvoidEndOfHandshakeSignal(int x) { return x == EndOfHandshakeSignal ? ~x : x; } internal static string GetRARPipeName(bool nodeReuse, bool lowPriority) { var context = HandshakeOptions.None; var userName = Environment.UserName; var clrVersion = typeof(bool).GetTypeInfo().Assembly.GetName().Version.Major; var is64Bit = XMakeAttributes.GetCurrentMSBuildArchitecture().Equals(XMakeAttributes.MSBuildArchitectureValues.x64); if (is64Bit) { context \|= HandshakeOptions.X64; } if (clrVersion == 2) { context \|= HandshakeOptions.CLR2; } if (nodeReuse) { context \|= HandshakeOptions.NodeReuse; } if (lowPriority) { context \|= HandshakeOptions.LowPriority; } return $"MSBuild.RAR.{userName}.{(int)context}"; }
<<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("FEATURE: LEGACY TASKS")] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("FEATURE: LEGACY TASKS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] [Ignore] // Ignore: Needs investigation, doesn't like Task.v4.0.dll >>>>>>> [Test] <<<<<<< [Test] [Ignore("FEATURE: LEGACY TASKS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test]
<<<<<<< ======= using Microsoft.Build.Shared; >>>>>>> using Microsoft.Build.Shared; <<<<<<< using Microsoft.Build.Shared; using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= using System.IO; using System.Reflection; using System.Collections; >>>>>>> using System.IO; using System.Reflection; using System.Collections; <<<<<<< using NUnit.Framework; ======= using System.Text.RegularExpressions; using Xunit; >>>>>>> using System.Text.RegularExpressions; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< ); Assert.AreEqual(CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MyResource.bmp,Kenny,Private"), c.ToString()); ======= ); // <-- Expect an ArgumentException here. >>>>>>> ); // <-- Expect an ArgumentException here. <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual( CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MySoundEffect.wav,Kenny ") + CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MySplashScreen.bmp,Cartman,c:\foo,Public"), c.ToString()); ======= Assert.Equal(@"/myswitch:MySoundEffect.wav,Kenny /myswitch:MySplashScreen.bmp,Cartman,c:\foo,Public", c.ToString()); >>>>>>> Assert.Equal( CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MySoundEffect.wav,Kenny ") + CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MySplashScreen.bmp,Cartman,c:\foo,Public"), c.ToString());
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using System.Xml; using Microsoft.Build.BackEnd; ======= using System.Reflection; >>>>>>> using System.Xml; using Microsoft.Build.BackEnd; <<<<<<< Assert.Throws<InvalidProjectFileException>(() => { // Note output is false so these are only input parameters string output = bool.FalseString; string required = bool.TrueString; string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).Assembly.FullName; List<ProjectUsingTaskElement> elementList = CreateParameterElementWithAttributes(output, required, type); TaskRegistry registry = TaskRegistryHelperMethods<ProjectPropertyInstance, ProjectItemInstance>.CreateTaskRegistryAndRegisterTasks(elementList); Assert.True(false); } ); ======= // Note output is false so these are only input parameters string output = bool.FalseString; string required = bool.TrueString; #if FEATURE_ASSEMBLY_LOCATION string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).Assembly.FullName; #else string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).GetTypeInfo().Assembly.FullName; #endif List<ProjectUsingTaskElement> elementList = CreateParameterElementWithAttributes(output, required, type); TaskRegistry registry = TaskRegistryHelperMethods<ProjectPropertyInstance, ProjectItemInstance>.CreateTaskRegistryAndRegisterTasks(elementList); Assert.Fail(); >>>>>>> Assert.Throws<InvalidProjectFileException>(() => { // Note output is false so these are only input parameters string output = bool.FalseString; string required = bool.TrueString; #if FEATURE_ASSEMBLY_LOCATION string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).Assembly.FullName; #else string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).GetTypeInfo().Assembly.FullName; #endif List<ProjectUsingTaskElement> elementList = CreateParameterElementWithAttributes(output, required, type); TaskRegistry registry = TaskRegistryHelperMethods<ProjectPropertyInstance, ProjectItemInstance>.CreateTaskRegistryAndRegisterTasks(elementList); Assert.True(false); } ); <<<<<<< Assert.NotNull(parameterInfo); Assert.Equal(parameterInfo.Name, filledOutAttributesParameter.Name); Assert.Equal(parameterInfo.Output, bool.Parse(expandedOutput)); Assert.Equal(parameterInfo.Required, bool.Parse(expandedRequired)); Assert.Equal(parameterInfo.PropertyType, Type.GetType(expandedType + "," + typeof(ITaskItem).Assembly.FullName, false /* don't throw on error /, true / case-insensitive /)); ======= Assert.IsNotNull(parameterInfo); Assert.AreEqual(parameterInfo.Name, filledOutAttributesParameter.Name); Assert.AreEqual(parameterInfo.Output, bool.Parse(expandedOutput)); Assert.AreEqual(parameterInfo.Required, bool.Parse(expandedRequired)); Assert.AreEqual( parameterInfo.PropertyType, Type.GetType( #if FEATURE_ASSEMBLY_LOCATION expandedType + "," + typeof(ITaskItem).Assembly.FullName, #else expandedType + "," + typeof(ITaskItem).GetTypeInfo().Assembly.FullName, #endif false / don't throw on error /, true / case-insensitive /)); >>>>>>> Assert.NotNull(parameterInfo); Assert.Equal(parameterInfo.Name, filledOutAttributesParameter.Name); Assert.Equal(parameterInfo.Output, bool.Parse(expandedOutput)); Assert.Equal(parameterInfo.Required, bool.Parse(expandedRequired)); Assert.Equal( parameterInfo.PropertyType, Type.GetType( #if FEATURE_ASSEMBLY_LOCATION expandedType + "," + typeof(ITaskItem).Assembly.FullName, #else expandedType + "," + typeof(ITaskItem).GetTypeInfo().Assembly.FullName, #endif false / don't throw on error /, true / case-insensitive */));
<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [TestFixtureSetUp] public static void Setup() ======= public CommandLineSwitchesTests() >>>>>>> public CommandLineSwitchesTests() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< #if !MONO [Test] ======= [Fact] >>>>>>> #if !MONO [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< #if !MONO && FEATURE_APPDOMAIN [Test] ======= [Fact] >>>>>>> #if !MONO && FEATURE_APPDOMAIN [Fact] <<<<<<< #if FEATURE_XML_SCHEMA_VALIDATION [Test] ======= [Fact] >>>>>>> #if FEATURE_XML_SCHEMA_VALIDATION [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InitializationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< ======= // NOTES: // 1) there's a bug in the Process class where the exit code is not returned properly i.e. if the command // fails with exit code 9009, Process.ExitCode returns 1 -- the statement below forces it to return the // correct exit code // 2) also because of another (or perhaps the same) bug in the Process class, when we use pushd/popd for a // UNC path, even if the command fails, the exit code comes back as 0 (seemingly reflecting the success // of popd) -- the statement below fixes that too // 3) the above described behavior is most likely bugs in the Process class because batch files in a // console window do not hide or change the exit code a.k.a. errorlevel, esp. since the popd command is // a no-fail command, and it never changes the previous errorlevel sw.WriteLine("exit %errorlevel%"); >>>>>>> <<<<<<< /// Get encoding based on OS. This will fall back to previous behavior on Windows before Windows 7. /// If the OS is greater than or equal to Windows 7, UTF8 encoding will be used for the cmd file. /// On unices, use ASCII. ======= /// Find the encoding for the batch file. >>>>>>> /// Find the encoding for the batch file. <<<<<<< #if FEATURE_OSVERSION if (!NativeMethodsShared.IsWindows) { return s_utf8WithoutBom; } // Windows 7 (6.1) or greater ======= var defaultEncoding = EncodingUtilities.CurrentSystemOemEncoding; string useUtf8 = string.IsNullOrEmpty(UseUtf8Encoding) ? UseUtf8Detect : UseUtf8Encoding; // UTF8 is only supposed in Windows 7 (6.1) or greater. >>>>>>> #if FEATURE_OSVERSION if (!NativeMethodsShared.IsWindows) { return s_utf8WithoutBom; } var defaultEncoding = EncodingUtilities.CurrentSystemOemEncoding; string useUtf8 = string.IsNullOrEmpty(UseUtf8Encoding) ? UseUtf8Detect : UseUtf8Encoding; // UTF8 is only supposed in Windows 7 (6.1) or greater. <<<<<<< return Environment.OSVersion.Version >= windows7 ? s_utf8WithoutBom : EncodingUtilities.CurrentSystemOemEncoding; #else return s_utf8WithoutBom; #endif ======= if (Environment.OSVersion.Version < windows7) { useUtf8 = UseUtf8Never; } switch (useUtf8.ToUpperInvariant()) { case UseUtf8Always: return s_utf8WithoutBom; case UseUtf8Never: return EncodingUtilities.CurrentSystemOemEncoding; default: return CanEncodeString(defaultEncoding.CodePage, Command + WorkingDirectory) ? defaultEncoding : s_utf8WithoutBom; } } /// <summary> /// Checks to see if a string can be encoded in a specified code page. /// </summary> /// <remarks>Internal for testing purposes.</remarks> /// <param name="codePage">Code page for encoding.</param> /// <param name="stringToEncode">String to encode.</param> /// <returns>True if the string can be encoded in the specified code page.</returns> internal static bool CanEncodeString(int codePage, string stringToEncode) { // We have a System.String that contains some characters. Get a lossless representation // in byte-array form. var unicodeEncoding = new UnicodeEncoding(); var unicodeBytes = unicodeEncoding.GetBytes(stringToEncode); // Create an Encoding using the desired code page, but throws if there's a // character that can't be represented. var systemEncoding = Encoding.GetEncoding(codePage, EncoderFallback.ExceptionFallback, DecoderFallback.ExceptionFallback); try { var oemBytes = Encoding.Convert(unicodeEncoding, systemEncoding, unicodeBytes); // If Convert didn't throw, we can represent everything in the desired encoding. return true; } catch (EncoderFallbackException) { // If a fallback encoding was attempted, we need to go to Unicode. return false; } >>>>>>> if (Environment.OSVersion.Version < windows7) { useUtf8 = UseUtf8Never; } switch (useUtf8.ToUpperInvariant()) { case UseUtf8Always: return s_utf8WithoutBom; case UseUtf8Never: return EncodingUtilities.CurrentSystemOemEncoding; default: return CanEncodeString(defaultEncoding.CodePage, Command + WorkingDirectory) ? defaultEncoding : s_utf8WithoutBom; } #else return s_utf8WithoutBom; #endif } /// <summary> /// Checks to see if a string can be encoded in a specified code page. /// </summary> /// <remarks>Internal for testing purposes.</remarks> /// <param name="codePage">Code page for encoding.</param> /// <param name="stringToEncode">String to encode.</param> /// <returns>True if the string can be encoded in the specified code page.</returns> internal static bool CanEncodeString(int codePage, string stringToEncode) { // We have a System.String that contains some characters. Get a lossless representation // in byte-array form. var unicodeEncoding = new UnicodeEncoding(); var unicodeBytes = unicodeEncoding.GetBytes(stringToEncode); // Create an Encoding using the desired code page, but throws if there's a // character that can't be represented. var systemEncoding = Encoding.GetEncoding(codePage, EncoderFallback.ExceptionFallback, DecoderFallback.ExceptionFallback); try { var oemBytes = Encoding.Convert(unicodeEncoding, systemEncoding, unicodeBytes); // If Convert didn't throw, we can represent everything in the desired encoding. return true; } catch (EncoderFallbackException) { // If a fallback encoding was attempted, we need to go to Unicode. return false; }
<<<<<<< ======= using System.Diagnostics; using System.Text; >>>>>>> using System.Diagnostics; using System.Text; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< string cmdPath = NativeMethodsShared.FindOnPath(shellName); Assert.IsNotNull(cmdPath); ======= Assert.NotNull(cmdPath); >>>>>>> string cmdPath = NativeMethodsShared.FindOnPath(shellName); Assert.NotNull(cmdPath); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test]
<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact]
<<<<<<< using System.IO; using System.Threading; ======= using System.Diagnostics; >>>>>>> using System.Diagnostics; using System.IO; using System.Threading; <<<<<<< ======= using System.Threading; using Microsoft.Win32.SafeHandles; >>>>>>> using Microsoft.Win32.SafeHandles; <<<<<<< using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; ======= using Xunit.Abstractions; using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME; >>>>>>> using Xunit.Abstractions; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
<<<<<<< using System.Threading; using Glass.Mapper.Sc.Configuration.Attributes; ======= using Glass.Mapper.Sc.Configuration; >>>>>>> using Glass.Mapper.Sc.Configuration; using Glass.Mapper.Sc.Configuration.Attributes; <<<<<<< ======= private static readonly object _setupLock = new object(); private bool _setupComplete; private bool _setupProcessing; >>>>>>> private static readonly object _setupLock = new object(); private bool _setupComplete; private bool _setupProcessing; <<<<<<< ======= if (!_setupComplete) return base.GetItemDefinition(itemId, context); >>>>>>> if (!_setupComplete) return base.GetItemDefinition(itemId, context); <<<<<<< return null; ======= return base.GetItemDefinition(itemId, context); >>>>>>> return base.GetItemDefinition(itemId, context); <<<<<<< FieldList fields = new FieldList(); ======= if (!_setupComplete) return base.GetItemFields(itemDefinition, versionUri, context); var fields = new FieldList(); >>>>>>> if (!_setupComplete) return base.GetItemFields(itemDefinition, versionUri, context); var fields = new FieldList();
<<<<<<< private static ConcurrentDictionary<string, object> _compileCache = new ConcurrentDictionary<string, object>(); public const string Parameters = "Parameters"; protected Func<T, string> GetCompiled<T>(Expression<Func<T, string>> expression) { var key = typeof(T).FullName + expression.Body.ToString(); if (_compileCache.ContainsKey(key)) { return (Func<T, string>)_compileCache[key]; } var compiled = expression.Compile(); _compileCache.TryAdd(key, compiled); return compiled; } protected Func<T, object> GetCompiled<T>(Expression<Func<T, object>> expression) { var key = typeof (T).FullName + expression.Body.ToString(); if (_compileCache.ContainsKey(key)) { return (Func<T, object>) _compileCache[key]; } var compiled = expression.Compile(); _compileCache.TryAdd(key, compiled); return compiled; } ======= public const string Parameters = "Parameters"; >>>>>>> private static ConcurrentDictionary<string, object> _compileCache = new ConcurrentDictionary<string, object>(); public const string Parameters = "Parameters"; protected Func<T, string> GetCompiled<T>(Expression<Func<T, string>> expression) { var key = typeof(T).FullName + expression.Body.ToString(); if (_compileCache.ContainsKey(key)) { return (Func<T, string>)_compileCache[key]; } var compiled = expression.Compile(); _compileCache.TryAdd(key, compiled); return compiled; } protected Func<T, object> GetCompiled<T>(Expression<Func<T, object>> expression) { var key = typeof (T).FullName + expression.Body.ToString(); if (_compileCache.ContainsKey(key)) { return (Func<T, object>) _compileCache[key]; } var compiled = expression.Compile(); _compileCache.TryAdd(key, compiled); return compiled; } <<<<<<< var attrs = Utilities.GetPropertiesCollection(parameters, true); if (IsInEditingMode && isEditable) { var url = new UrlString(); url.Parameters.Add(attrs); return Editable(model, field, url.Query); } else { return RenderImage(GetCompiled(field).Invoke(model) as Fields.Image, parameters == null ? null : attrs); } ======= return RenderImage(field.Compile().Invoke(model) as Fields.Image, parameters == null ? null : attrs); >>>>>>> return RenderImage(GetCompiled(field).Invoke(model) as Fields.Image, parameters == null ? null : attrs); <<<<<<< firstPart = RenderImage(image, WebUtil.ParseUrlParameters(parametersString)); ======= firstPart = RenderImage(image, dictionary); >>>>>>> firstPart = RenderImage(image, dictionary); <<<<<<< var result = BeginRenderLink(link, WebUtil.ParseUrlParameters(parametersString), null, linkWriter); ======= var result = BeginRenderLink(link, dictionary,null, linkWriter); >>>>>>> var result = BeginRenderLink(link, dictionary,null, linkWriter);
<<<<<<< if (!string.IsNullOrEmpty(contents)) attrs["haschildren"] = "true"; ======= if (contents.IsNotNullOrEmpty()) { attrs.Add("haschildren", "true"); } >>>>>>> if (!string.IsNullOrEmpty(contents)) attrs["haschildren"] = "true"; if (contents.IsNotNullOrEmpty()) { attrs.Add("haschildren", "true"); } <<<<<<< model, Utilities.ConstructQueryString(attrs), ======= model, attrs, >>>>>>> model, Utilities.ConstructQueryString(attrs),
<<<<<<< inkCanvas1.InkPresenter.InputDeviceTypes = CoreInputDeviceTypes.Pen \| CoreInputDeviceTypes.Mouse \| CoreInputDeviceTypes.Touch; var stackPanel = new windows.UI.Xaml.Controls.StackPanel() ======= inkCanvas1.InkPresenter.InputDeviceTypes = CoreInputDeviceTypes.Pen \| CoreInputDeviceTypes.Mouse \| CoreInputDeviceTypes.Touch; Windows.UI.Xaml.Controls.StackPanel stackPanel = new Windows.UI.Xaml.Controls.StackPanel() >>>>>>> inkCanvas1.InkPresenter.InputDeviceTypes = CoreInputDeviceTypes.Pen \| CoreInputDeviceTypes.Mouse \| CoreInputDeviceTypes.Touch; windows.UI.Xaml.Controls.StackPanel stackPanel = new windows.UI.Xaml.Controls.StackPanel() <<<<<<< stackPanel.Children.Add(new windows.UI.Xaml.Controls.Button() ======= var button = new Windows.UI.Xaml.Controls.Button() >>>>>>> var button = new windows.UI.Xaml.Controls.Button <<<<<<< HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, Content = "This is a UWP Button", }); ======= HorizontalAlignment = Windows.UI.Xaml.HorizontalAlignment.Center, Content = "ContentDialog UWP Button", }; button.Tapped += Button_Tapped; stackPanel.Children.Add(button); >>>>>>> HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, Content = "ContentDialog UWP Button", }; button.Tapped += Button_Tapped; stackPanel.Children.Add(button); <<<<<<< stackPanel.Children.Add(new windows.UI.Xaml.Controls.Button() ======= Windows.UI.Xaml.Controls.Flyout flyout = new Windows.UI.Xaml.Controls.Flyout(); flyout.Content = new Windows.UI.Xaml.Controls.TextBlock() { Text = "Flyout content", }; var button2 = new Windows.UI.Xaml.Controls.Button() >>>>>>> windows.UI.Xaml.Controls.Flyout flyout = new windows.UI.Xaml.Controls.Flyout(); flyout.Content = new windows.UI.Xaml.Controls.TextBlock() { Text = "Flyout content", }; var button2 = new windows.UI.Xaml.Controls.Button() <<<<<<< HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, Content = "Another long UWP Button", }); ======= HorizontalAlignment = Windows.UI.Xaml.HorizontalAlignment.Center, Content = "Long UWP Button with Flyout", Flyout = flyout, }; stackPanel.Children.Add(button2); var comboBox = new Windows.UI.Xaml.Controls.ComboBox() { HorizontalAlignment = Windows.UI.Xaml.HorizontalAlignment.Center, }; comboBox.Items.Add("One"); comboBox.Items.Add("Two"); comboBox.Items.Add("Three"); comboBox.Items.Add("Four"); stackPanel.Children.Add(comboBox); Windows.UI.Xaml.Controls.Grid grid = new Windows.UI.Xaml.Controls.Grid(); stackPanel.Children.Add(grid); _contentDialog = new Windows.UI.Xaml.Controls.ContentDialog(); _contentDialog.Content = new Windows.UI.Xaml.Controls.TextBlock() { Text = "ContentDialog content", }; stackPanel.Children.Add(_contentDialog); var popup = new Windows.UI.Xaml.Controls.Primitives.Popup() { Width = 50, Height = 50, ShouldConstrainToRootBounds = false, Child = new Windows.UI.Xaml.Controls.TextBlock() { Text = "Popup child", }, }; grid.Children.Add(popup); >>>>>>> HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, Content = "Long UWP Button with Flyout", Flyout = flyout, }; stackPanel.Children.Add(button2); var comboBox = new windows.UI.Xaml.Controls.ComboBox() { HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, }; comboBox.Items.Add("One"); comboBox.Items.Add("Two"); comboBox.Items.Add("Three"); comboBox.Items.Add("Four"); stackPanel.Children.Add(comboBox); windows.UI.Xaml.Controls.Grid grid = new windows.UI.Xaml.Controls.Grid(); stackPanel.Children.Add(grid); _contentDialog = new windows.UI.Xaml.Controls.ContentDialog(); _contentDialog.Content = new windows.UI.Xaml.Controls.TextBlock() { Text = "ContentDialog content", }; stackPanel.Children.Add(_contentDialog); var popup = new windows.UI.Xaml.Controls.Primitives.Popup() { Width = 50, Height = 50, ShouldConstrainToRootBounds = false, Child = new windows.UI.Xaml.Controls.TextBlock() { Text = "Popup child", }, }; grid.Children.Add(popup);
<<<<<<< /// <summary> /// Rights for this ACE. /// </summary> public enum UrlReservationRights { /// <summary> /// The 'register' rights value of the child UrlAce element /// </summary> register, /// <summary> /// The 'delete' rights value of the child UrlAce element /// </summary> @delegate, /// <summary> /// The 'all' rights value of the child UrlAce element /// </summary> all, } /// <summary> /// Specifies the behavior when trying to install a URL reservation and it already exists. /// </summary> public enum UrlReservationHandleExisting { /// <summary> /// Replaces the existing URL reservation (the default). /// </summary> replace, /// <summary> /// Keeps the existing URL reservation. /// </summary> ignore, /// <summary> /// The installation fails. /// </summary> fail, } /// <summary> /// Flags for indicating when the service should be configured. /// </summary> [Flags] public enum ConfigureServiceTrigger { #pragma warning disable 1591 /// <summary> /// Not a valid value for ServiceConfig.On(Install, Reinstall, Uninstall) /// </summary> None = 0, Install = 1, Reinstall = 2, Uninstall = 4 #pragma warning restore 1591 } /// <summary> /// Possible values for ServiceInstall.(First\|Second\|Third)FailureActionType /// </summary> public enum FailureActionType { #pragma warning disable 1591 none, reboot, restart, runCommand #pragma warning restore 1591 } ======= /// <summary> /// CA assembly validation mode /// </summary> public enum CAValidation { /// <summary> /// The CA assembly is loaded in the temporary remote AppDomain for validation. /// Assembly file is unlocked and at the end of the validation the assembly is unloaded. /// </summary> InRemoteAppDomain, /// <summary> /// The CA assembly is loaded in the current AppDomain for validation. /// Assembly file is unlocked but the assembly will not be unloaded at the end of the validation. /// This mode may lead to unpredictable behaviour. /// </summary> InCurrentAppDomain, /// <summary> /// CA assembly validation is disabled. /// </summary> Disabled } >>>>>>> /// <summary> /// Rights for this ACE. /// </summary> public enum UrlReservationRights { /// <summary> /// The 'register' rights value of the child UrlAce element /// </summary> register, /// <summary> /// The 'delete' rights value of the child UrlAce element /// </summary> @delegate, /// <summary> /// The 'all' rights value of the child UrlAce element /// </summary> all, } /// <summary> /// Specifies the behavior when trying to install a URL reservation and it already exists. /// </summary> public enum UrlReservationHandleExisting { /// <summary> /// Replaces the existing URL reservation (the default). /// </summary> replace, /// <summary> /// Keeps the existing URL reservation. /// </summary> ignore, /// <summary> /// The installation fails. /// </summary> fail, } /// <summary> /// Flags for indicating when the service should be configured. /// </summary> [Flags] public enum ConfigureServiceTrigger { #pragma warning disable 1591 /// <summary> /// Not a valid value for ServiceConfig.On(Install, Reinstall, Uninstall) /// </summary> None = 0, Install = 1, Reinstall = 2, Uninstall = 4 #pragma warning restore 1591 } /// <summary> /// Possible values for ServiceInstall.(First\|Second\|Third)FailureActionType /// </summary> public enum FailureActionType { #pragma warning disable 1591 none, reboot, restart, runCommand #pragma warning restore 1591 /// CA assembly validation mode /// </summary> public enum CAValidation { /// <summary> /// The CA assembly is loaded in the temporary remote AppDomain for validation. /// Assembly file is unlocked and at the end of the validation the assembly is unloaded. /// </summary> InRemoteAppDomain, /// <summary> /// The CA assembly is loaded in the current AppDomain for validation. /// Assembly file is unlocked but the assembly will not be unloaded at the end of the validation. /// This mode may lead to unpredictable behaviour. /// </summary> InCurrentAppDomain, /// <summary> /// CA assembly validation is disabled. /// </summary> Disabled }
<<<<<<< ProcessUrlReservations(project, featureComponents, defaultFeatureComponents, product); ======= ProcessIniFiles(project, featureComponents, defaultFeatureComponents, product); >>>>>>> ProcessUrlReservations(project, featureComponents, defaultFeatureComponents, product); ProcessIniFiles(project, featureComponents, defaultFeatureComponents, product); <<<<<<< static void ProcessUrlReservations(Project project, Dictionary<Feature, List<string>> featureComponents, List<string> defaultFeatureComponents, XElement product) { if (!project.UrlReservations.Any()) return; project.IncludeWixExtension(WixExtension.Http); int componentCount = 0; foreach (UrlReservation item in project.UrlReservations) { componentCount++; var compId = "UrlReservation" + componentCount; if (item.ActualFeatures.Any()) featureComponents.Map(item.ActualFeatures, compId); else defaultFeatureComponents.Add(compId); var topLevelDir = GetTopLevelDir(product); var comp = topLevelDir.AddElement( new XElement("Component", new XAttribute("Id", compId), new XAttribute("Guid", WixGuid.NewGuid(compId)))); comp.Add(item.ToXml()); } } ======= static void ProcessIniFiles(Project project, Dictionary<Feature, List<string>> featureComponents, List<string> defaultFeatureComponents, XElement product) { if (!project.IniFiles.Any()) return; int componentCount = 0; foreach (IniFile item in project.IniFiles) { componentCount++; var compId = "IniFile" + componentCount; if (item.ActualFeatures.Any()) featureComponents.Map(item.ActualFeatures, compId); else defaultFeatureComponents.Add(compId); var topLevelDir = GetTopLevelDir(product); var comp = topLevelDir.AddElement( new XElement("Component", new XAttribute("Id", compId), new XAttribute("Guid", WixGuid.NewGuid(compId)))); comp.Add(item.ToXml()); } } >>>>>>> static void ProcessUrlReservations(Project project, Dictionary<Feature, List<string>> featureComponents, List<string> defaultFeatureComponents, XElement product) { if (!project.UrlReservations.Any()) return; project.IncludeWixExtension(WixExtension.Http); int componentCount = 0; foreach (UrlReservation item in project.UrlReservations) { componentCount++; var compId = "UrlReservation" + componentCount; if (item.ActualFeatures.Any()) featureComponents.Map(item.ActualFeatures, compId); else defaultFeatureComponents.Add(compId); var topLevelDir = GetTopLevelDir(product); var comp = topLevelDir.AddElement( new XElement("Component", new XAttribute("Id", compId), new XAttribute("Guid", WixGuid.NewGuid(compId)))); comp.Add(item.ToXml()); } } static void ProcessIniFiles(Project project, Dictionary<Feature, List<string>> featureComponents, List<string> defaultFeatureComponents, XElement product) { if (!project.IniFiles.Any()) return; int componentCount = 0; foreach (IniFile item in project.IniFiles) { componentCount++; var compId = "IniFile" + componentCount; if (item.ActualFeatures.Any()) featureComponents.Map(item.ActualFeatures, compId); else defaultFeatureComponents.Add(compId); var topLevelDir = GetTopLevelDir(product); var comp = topLevelDir.AddElement( new XElement("Component", new XAttribute("Id", compId), new XAttribute("Guid", WixGuid.NewGuid(compId)))); comp.Add(item.ToXml()); } }
<<<<<<< ======= Client.Version = DDragonVersion; >>>>>>>
<<<<<<< ======= using System.IO; using Windows.Foundation; >>>>>>> <<<<<<< public IBuffer PixelBuffer { get; private set; } ======= private InMemoryBuffer _buffer; public IBuffer PixelBuffer => _buffer; >>>>>>> public IBuffer PixelBuffer { get; } <<<<<<< PixelBuffer = new UwpBuffer((uint)(pixelWidth * pixelHeight * 4)); ======= _buffer = new InMemoryBuffer(pixelWidth * pixelHeight * 4); >>>>>>> PixelBuffer = new UwpBuffer((uint)(pixelWidth * pixelHeight * 4));
<<<<<<< using Windows.System.Profile; using Uno.UI.Runtime.Skia.Tizen.System.Profile; ======= using Windows.ApplicationModel; using Uno.UI.Runtime.Skia.Tizen.ApplicationModel; using Uno.ApplicationModel; >>>>>>> using Windows.System.Profile; using Uno.UI.Runtime.Skia.Tizen.System.Profile; using Windows.ApplicationModel; using Uno.UI.Runtime.Skia.Tizen.ApplicationModel; using Uno.ApplicationModel; <<<<<<< ApiExtensibility.Register(typeof(IAnalyticsInfoExtension), o => new TizenAnalyticsInfoExtension(o)); ======= ApiExtensibility.Register(typeof(IPackageIdExtension), o => new TizenPackageIdExtension(o)); >>>>>>> ApiExtensibility.Register(typeof(IAnalyticsInfoExtension), o => new TizenAnalyticsInfoExtension(o)); ApiExtensibility.Register(typeof(IPackageIdExtension), o => new TizenPackageIdExtension(o));
<<<<<<< this.source.Add (new ListViewExamples ()); ======= this.source.Add (new SideDrawerExamples ()); >>>>>>> this.source.Add (new ListViewExamples ()); this.source.Add (new SideDrawerExamples ());

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= // foreach (var a in new[] ...) if (node is ForEachStatementSyntax) { ForEachExpressionCheck(node, semanticModel, reportDiagnostic, filePath, cancellationToken); return; } >>>>>>> <<<<<<< private static void EqualsValueClauseCheck(SyntaxNode node, SemanticModel semanticModel, Action<Diagnostic> reportDiagnostic, string filePath) ======= private static void ForEachExpressionCheck(SyntaxNode node, SemanticModel semanticModel, Action<Diagnostic> reportDiagnostic, string filePath, CancellationToken cancellationToken) { var foreachExpression = node as ForEachStatementSyntax; if (foreachExpression.Expression != null) { var typeInfo = semanticModel.GetTypeInfo(foreachExpression.Expression, cancellationToken); if (typeInfo.Type != null) { var arraySymbol = typeInfo.Type as IArrayTypeSymbol; if (arraySymbol != null && arraySymbol.ElementType.IsValueType) { reportDiagnostic(Diagnostic.Create(ValueTypeToReferenceTypeConversionRule, foreachExpression.Expression.GetLocation(), EmptyMessageArgs)); return; } var namedTypeSymbol = typeInfo.Type as INamedTypeSymbol; if (namedTypeSymbol != null && namedTypeSymbol.Arity == 1 && namedTypeSymbol.TypeArguments[0].IsValueType && foreachExpression.Type != null) { var leftHandType = semanticModel.GetTypeInfo(foreachExpression.Type, cancellationToken).Type; if (leftHandType != null && leftHandType.IsValueType) { reportDiagnostic(Diagnostic.Create(ValueTypeToReferenceTypeConversionRule, foreachExpression.Expression.GetLocation(), EmptyMessageArgs)); return; } } } } } private static void EqualsValueClauseCheck(SyntaxNode node, SemanticModel semanticModel, Action<Diagnostic> reportDiagnostic, string filePath, CancellationToken cancellationToken) >>>>>>> private static void EqualsValueClauseCheck(SyntaxNode node, SemanticModel semanticModel, Action<Diagnostic> reportDiagnostic, string filePath, CancellationToken cancellationToken) <<<<<<< var symbolInfo = semanticModel.GetSymbolInfo(node).Symbol; if (symbolInfo?.ContainingType?.IsValueType == true && !insideObjectCreation) ======= var symbolInfo = semanticModel.GetSymbolInfo(node, cancellationToken).Symbol; if (symbolInfo != null && symbolInfo.ContainingType != null && symbolInfo.ContainingType.IsValueType) >>>>>>> var symbolInfo = semanticModel.GetSymbolInfo(node, cancellationToken).Symbol; if (symbolInfo?.ContainingType?.IsValueType == true && !insideObjectCreation)

<<<<<<< ======= using System.Xml; using System.Collections.Specialized; >>>>>>> using System.Xml; using System.Collections.Specialized; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(System.ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; #pragma warning disable 0219 ======= using Xunit; >>>>>>> using Xunit; #pragma warning disable 0219 <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< #endif private int _projectId; ======= private int projectId; >>>>>>> #endif private int projectId; <<<<<<< #endif private BuildEventContext _parentProjectBuildEventContext; ======= private BuildEventContext parentProjectBuildEventContext; >>>>>>> #endif private BuildEventContext parentProjectBuildEventContext; <<<<<<< #endif private IDictionary<string, string> _globalProperties; ======= private IDictionary<string, string> globalProperties; >>>>>>> #endif private IDictionary<string, string> globalProperties; <<<<<<< #endif private string _toolsVersion; ======= private string toolsVersion; >>>>>>> #endif private string toolsVersion; <<<<<<< #endif private IEnumerable _properties; ======= private IEnumerable properties; >>>>>>> #endif private IEnumerable properties; <<<<<<< #endif private IEnumerable _items; ======= private IEnumerable items; >>>>>>> #endif private IEnumerable items;

<<<<<<< private string _pathToMSBuildExe = Path.Combine(Environment.CurrentDirectory, "MSBuild.exe"); #if FEATURE_SPECIAL_FOLDERS ======= private string _pathToMSBuildExe = Path.Combine(Directory.GetCurrentDirectory(), "MSBuild.exe"); >>>>>>> private string _pathToMSBuildExe = Path.Combine(Directory.GetCurrentDirectory(), "MSBuild.exe"); #if FEATURE_SPECIAL_FOLDERS

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using System.Reflection; using System.Collections; using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; using System.Text.RegularExpressions; >>>>>>> using System.Reflection; using System.Collections; using Microsoft.Build.Framework; using Microsoft.Build.BackEnd.Logging; using System.Text.RegularExpressions; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] public class SolutionProjectGenerator_Tests ======= public class SolutionProjectGenerator_Tests : IDisposable >>>>>>> public class SolutionProjectGenerator_Tests : IDisposable <<<<<<< [SetUp] public void Setup() ======= public SolutionProjectGenerator_Tests() >>>>>>> public SolutionProjectGenerator_Tests() <<<<<<< [TearDown] public void Cleanup() ======= public void Dispose() >>>>>>> public void Dispose() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact(Skip = "Ignored in MSTest")] // Ignore: Needs investigation >>>>>>> [Fact(Skip = "Ignored in MSTest")] // Ignore: Needs investigation <<<<<<< Assert.AreEqual(t.DefaultSubToolsetVersion, instances[0].SubToolsetVersion); if (t.DefaultSubToolsetVersion != null) { Assert.AreEqual(t.DefaultSubToolsetVersion, instances[0].GetPropertyValue("VisualStudioVersion")); } else { Assert.AreEqual(String.Empty, instances[0].GetPropertyValue("VisualStudioVersion")); } ======= Assert.Equal(t.DefaultSubToolsetVersion, instances[0].SubToolsetVersion); Assert.Equal(t.DefaultSubToolsetVersion, instances[0].GetPropertyValue("VisualStudioVersion")); >>>>>>> Assert.Equal(t.DefaultSubToolsetVersion, instances[0].SubToolsetVersion); if (t.DefaultSubToolsetVersion != null) { Assert.Equal(t.DefaultSubToolsetVersion, instances[0].GetPropertyValue("VisualStudioVersion")); } else { Assert.Equal(String.Empty, instances[0].GetPropertyValue("VisualStudioVersion")); } <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [Ignore] ======= [Fact(Skip = "Ignored in MSTest")] >>>>>>> [Fact(Skip = "Ignored in MSTest")] <<<<<<< [Test] [Ignore] ======= [Fact(Skip = "Ignored in MSTest")] >>>>>>> [Fact(Skip = "Ignored in MSTest")] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using System.Text.RegularExpressions; using System.Threading; using Microsoft.Build.Framework; >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [SetUp] public void SetUp() { _nodeRequestId++; } [TearDown] public void TearDown() { } [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(ArgumentNullException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< internal static StreamWriter OpenWrite(string path, bool append, Encoding encoding = null) { const int DefaultFileStreamBufferSize = 4096; FileMode mode = append ? FileMode.Append : FileMode.Create; Stream fileStream = new FileStream(path, mode, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamWriter(fileStream); } else { return new StreamWriter(fileStream, encoding); } } internal static StreamReader OpenRead(string path, Encoding encoding = null, bool detectEncodingFromByteOrderMarks = true) { const int DefaultFileStreamBufferSize = 4096; Stream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamReader(fileStream); } else { return new StreamReader(fileStream, encoding, detectEncodingFromByteOrderMarks); } } ======= /// <summary> /// Returns true when the entry point application is Visual Studio. /// </summary> internal static bool RunningInVisualStudio { get { // Check if initialized and do so if not yet if (!s_runningInVisualStudio.HasValue) { GetExecutionInfo(); } return s_runningInVisualStudio.Value; } } >>>>>>> /// <summary> /// Returns true when the entry point application is Visual Studio. /// </summary> internal static bool RunningInVisualStudio { get { // Check if initialized and do so if not yet if (!s_runningInVisualStudio.HasValue) { GetExecutionInfo(); } return s_runningInVisualStudio.Value; } } internal static StreamWriter OpenWrite(string path, bool append, Encoding encoding = null) { const int DefaultFileStreamBufferSize = 4096; FileMode mode = append ? FileMode.Append : FileMode.Create; Stream fileStream = new FileStream(path, mode, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamWriter(fileStream); } else { return new StreamWriter(fileStream, encoding); } } internal static StreamReader OpenRead(string path, Encoding encoding = null, bool detectEncodingFromByteOrderMarks = true) { const int DefaultFileStreamBufferSize = 4096; Stream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamReader(fileStream); } else { return new StreamReader(fileStream, encoding, detectEncodingFromByteOrderMarks); } }

<<<<<<< using UniInject; using UnityEngine.EventSystems; ======= using System.Globalization; using System.Threading; >>>>>>> using UniInject; using UnityEngine.EventSystems; using System.Globalization; using System.Threading;

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [SetUp] public void Setup() ======= public AssemblyTaskFactory_Tests() >>>>>>> public AssemblyTaskFactory_Tests() <<<<<<< /// <summary> /// Tear down what was created in setup /// </summary> [TearDown] public void TearDownAttribute() { _taskFactory = null; _loadInfo = null; _loadedType = null; } ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [Ignore] ======= [Fact(Skip = "Ignored in MSTest")] >>>>>>> [Fact(Skip = "Ignored in MSTest")] <<<<<<< Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); ======= Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); >>>>>>> Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); ======= Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); >>>>>>> Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask);

<<<<<<< using NUnit.Framework; ======= using System.Collections; >>>>>>> using System.Collections; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using System.Collections.Generic; using System.Text; >>>>>>> using System.Collections.Generic; using System.Text; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(LoggerException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< string log = null; try { SetUpFileLoggerAndLogMessage("logfile=||/invalid||", new BuildMessageEventArgs("message here", null, null, MessageImportance.High)); } finally ======= Assert.Throws<LoggerException>(() => >>>>>>> Assert.Throws<LoggerException>(() => <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(LoggerException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(LoggerException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] [ExpectedException(typeof(LoggerException))] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] [Ignore] // Ignore: See https://github.com/dotnet/roslyn/pull/2772 // This is a known issue in Roslyn. This test should be enabled if Roslyn is updated for this scenario. >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] [Ignore] // Ignore: See https://github.com/dotnet/roslyn/pull/2772 // This is a known issue in Roslyn. This test should be enabled if Roslyn is updated for this scenario. >>>>>>> [Test]

<<<<<<< using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Construction; ======= >>>>>>> using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Construction; <<<<<<< ======= using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Xunit; >>>>>>> using Microsoft.Build.Construction; using Microsoft.Build.Evaluation; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [TestFixtureSetUp] public void SuiteSetup() ======= public ConsoleLoggerTest() >>>>>>> public ConsoleLoggerTest() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using System.Runtime.Serialization.Formatters.Binary; ======= using Microsoft.Build.Framework; >>>>>>> using Microsoft.Build.Framework; <<<<<<< using NUnit.Framework; ======= using System.Text.RegularExpressions; using Xunit; >>>>>>> using System.Text.RegularExpressions; using System.Runtime.Serialization.Formatters.Binary; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using Microsoft.Build.Shared; ======= using System.Reflection; using Microsoft.Build.Framework; >>>>>>> using System.Reflection; using Microsoft.Build.Framework; <<<<<<< using NUnit.Framework; ======= using Microsoft.Build.Shared; using Xunit; >>>>>>> using Microsoft.Build.Shared; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.DelaySign, "DelaySign should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/delaysign"), false /* no response file */); ======= Assert.False(t.DelaySign); // "DelaySign should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/delaysign", false /* no response file */); >>>>>>> Assert.False(t.DelaySign); // "DelaySign should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/delaysign"), false /* no response file */); <<<<<<< Assert.IsTrue(t.DelaySign, "DelaySign should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/delaysign"), false /* no response file */); ======= Assert.True(t.DelaySign); // "DelaySign should be true" CommandLine.ValidateHasParameter(t, @"/delaysign", false /* no response file */); >>>>>>> Assert.True(t.DelaySign); // "DelaySign should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/delaysign"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.KeyContainer, "KeyContainer should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:"), false /* no response file */); ======= Assert.Null(t.KeyContainer); // "KeyContainer should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/keycontainer:", false /* no response file */); >>>>>>> Assert.Null(t.KeyContainer); // "KeyContainer should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.KeyContainer, "KeyContainer should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:"), false /* no response file */); ======= Assert.Null(t.KeyContainer); // "KeyContainer should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/keycontainer:", false /* no response file */); >>>>>>> Assert.Null(t.KeyContainer); // "KeyContainer should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:"), false /* no response file */); <<<<<<< Assert.AreEqual(testParameterValue, t.KeyContainer, "New KeyContainer value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:") + testParameterValue, false /* no response file */); ======= Assert.Equal(testParameterValue, t.KeyContainer); // "New KeyContainer value should be set" CommandLine.ValidateHasParameter(t, @"/keycontainer:" + testParameterValue, false /* no response file */); >>>>>>> Assert.Equal(testParameterValue, t.KeyContainer); // "New KeyContainer value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keycontainer:") + testParameterValue, false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.KeyFile, "KeyFile should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:"), false /* no response file */); ======= Assert.Null(t.KeyFile); // "KeyFile should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/keyfile:", false /* no response file */); >>>>>>> Assert.Null(t.KeyFile); // "KeyFile should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:"), false /* no response file */); <<<<<<< Assert.AreEqual(badParameterValue, t.KeyFile, "New KeyFile value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + badParameterValue, false /* no response file */); ======= Assert.Equal(badParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter(t, @"/keyfile:" + badParameterValue, false /* no response file */); >>>>>>> Assert.Equal(badParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + badParameterValue, false /* no response file */); <<<<<<< Assert.AreEqual(goodParameterValue, t.KeyFile, "New KeyFile value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + goodParameterValue, false /* no response file */); ======= Assert.Equal(goodParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter(t, @"/keyfile:" + goodParameterValue, false /* no response file */); >>>>>>> Assert.Equal(goodParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + goodParameterValue, false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.KeyFile, "KeyFile should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:"), false /* no response file */); ======= Assert.Null(t.KeyFile); // "KeyFile should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/keyfile:", false /* no response file */); >>>>>>> Assert.Null(t.KeyFile); // "KeyFile should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:"), false /* no response file */); <<<<<<< Assert.AreEqual(testParameterValue, t.KeyFile, "New KeyFile value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + testParameterValue, false /* no response file */); ======= Assert.Equal(testParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter(t, @"/keyfile:" + testParameterValue, false /* no response file */); >>>>>>> Assert.Equal(testParameterValue, t.KeyFile); // "New KeyFile value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/keyfile:") + testParameterValue, false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test]

<<<<<<< using NUnit.Framework; #pragma warning disable 0219 ======= using Xunit; >>>>>>> using Xunit; #pragma warning disable 0219 <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< if (NativeMethodsShared.IsUnixLike) { Assert.Ignore("FileTracker is not supported under Unix"); } s_defaultFileTrackerPathUnquoted = null;//FileTracker.GetFileTrackerPath(ExecutableType.SameAsCurrentProcess); s_defaultFileTrackerPath = null; //"\"" + defaultFileTrackerPathUnquoted + "\""; s_defaultTrackerPath = null;//FileTracker.GetTrackerPath(ExecutableType.SameAsCurrentProcess); ======= s_defaultFileTrackerPathUnquoted = FileTracker.GetFileTrackerPath(ExecutableType.SameAsCurrentProcess); s_defaultFileTrackerPath = "\"" + s_defaultFileTrackerPathUnquoted + "\""; s_defaultTrackerPath = FileTracker.GetTrackerPath(ExecutableType.SameAsCurrentProcess); >>>>>>> if (NativeMethodsShared.IsUnixLike) { Assert.Ignore("FileTracker is not supported under Unix"); } s_defaultFileTrackerPathUnquoted = FileTracker.GetFileTrackerPath(ExecutableType.SameAsCurrentProcess); s_defaultFileTrackerPath = "\"" + s_defaultFileTrackerPathUnquoted + "\""; s_defaultTrackerPath = FileTracker.GetTrackerPath(ExecutableType.SameAsCurrentProcess); <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test]

<<<<<<< [Test] ======= [TestMethod] public void GetApiContractReferencesHandlesNullContracts() { string[] returnValue = ToolLocationHelper.GetApiContractReferences(null, String.Empty); Assert.AreEqual(0, returnValue.Length); } [TestMethod] >>>>>>> [Test] public void GetApiContractReferencesHandlesNullContracts() { string[] returnValue = ToolLocationHelper.GetApiContractReferences(null, String.Empty); Assert.AreEqual(0, returnValue.Length); } [Test] <<<<<<< string platformDirectory = Path.Combine(testDirectoryRoot, "OneCoreSDK", "1.0") + Path.DirectorySeparatorChar; string propsDirectory = Path.Combine( new[] { platformDirectory, "DesignTime", "CommonConfiguration", "Neutral", "MyPlatform", "0.8.0.0" }); ======= string platformDirectory = Path.Combine(testDirectoryRoot, "OneCoreSDK\\1.0\\"); string propsDirectory = Path.Combine(platformDirectory, "DesignTime\\CommonConfiguration\\Neutral\\MyPlatform\\0.8.0.0"); string platformDirectory2 = Path.Combine(platformDirectory, "Platforms", "MyPlatform", "0.8.0.0"); >>>>>>> string platformDirectory = Path.Combine(testDirectoryRoot, "OneCoreSDK", "1.0") + Path.DirectorySeparatorChar; string propsDirectory = Path.Combine( new[] { platformDirectory, "DesignTime", "CommonConfiguration", "Neutral", "MyPlatform", "0.8.0.0" }); string platformDirectory2 = Path.Combine(platformDirectory, "Platforms", "MyPlatform", "0.8.0.0"); <<<<<<< File.WriteAllText(Path.Combine(platformDirectory, "SDKManifest.xml"), "Test"); ======= File.WriteAllText(Path.Combine(platformDirectory, "sdkManifest.xml"), "Test"); File.WriteAllText(Path.Combine(platformDirectory2, "Platform.xml"), "Test"); >>>>>>> File.WriteAllText(Path.Combine(platformDirectory, "SDKManifest.xml"), "Test"); File.WriteAllText(Path.Combine(platformDirectory2, "Platform.xml"), "Test");

<<<<<<< using Microsoft.Build.Shared; using NUnit.Framework; ======= using Xunit; >>>>>>> using Microsoft.Build.Shared; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< property = project.GetProperty(varName); Assert.AreEqual("v", property.UnevaluatedValue); ======= property = project.GetProperty("Username"); Assert.Equal("v", property.UnevaluatedValue); >>>>>>> property = project.GetProperty(varName); Assert.Equal("v", property.UnevaluatedValue); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(true, project.GetProperty(varName).IsEnvironmentProperty); Assert.AreEqual(false, project.GetProperty(varName).IsGlobalProperty); Assert.AreEqual(false, project.GetProperty(varName).IsReservedProperty); Assert.AreEqual(false, project.GetProperty(varName).IsImported); ======= Assert.Equal(true, project.GetProperty("username").IsEnvironmentProperty); Assert.Equal(false, project.GetProperty("username").IsGlobalProperty); Assert.Equal(false, project.GetProperty("username").IsReservedProperty); Assert.Equal(false, project.GetProperty("username").IsImported); >>>>>>> Assert.Equal(true, project.GetProperty(varName).IsEnvironmentProperty); Assert.Equal(false, project.GetProperty(varName).IsGlobalProperty); Assert.Equal(false, project.GetProperty(varName).IsReservedProperty); Assert.Equal(false, project.GetProperty(varName).IsImported); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using Microsoft.Build.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< s_engineResourceManager = new ResourceManager("Microsoft.Build.Resources.Strings", typeof(ProjectCollection).GetTypeInfo().Assembly); ======= s_engineResourceManager = new ResourceManager("Microsoft.Build.Strings", typeof(ProjectCollection).Assembly); >>>>>>> s_engineResourceManager = new ResourceManager("Microsoft.Build.Strings", typeof(ProjectCollection).GetTypeInfo().Assembly);

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [Ignore("FEATURE: TASKHOST")] ======= [Fact] >>>>>>> [Fact(Skip="FEATURE: TASKHOST")] <<<<<<< [Test] [Ignore("FEATURE: TASKHOST")] ======= [Fact] >>>>>>> [Fact(Skip="FEATURE: TASKHOST")]

<<<<<<< using NUnit.Framework; ======= >>>>>>>

<<<<<<< using Microsoft.Build.Shared; using NUnit.Framework; ======= using Xunit; >>>>>>> using Microsoft.Build.Shared; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(1, Helpers.MakeList(itemGroupElement.Items).Count); Assert.AreEqual(true, object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); ======= Assert.Equal(1, Helpers.MakeList(itemGroupElement.Items).Count); Assert.Equal(true, Object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); >>>>>>> Assert.Equal(1, Helpers.MakeList(itemGroupElement.Items).Count); Assert.Equal(true, object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); <<<<<<< Assert.AreEqual(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItems("j")))); Assert.AreEqual(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsIgnoringCondition("j")))); Assert.AreEqual(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsByEvaluatedInclude("i1")))); ======= Assert.Equal(true, Object.ReferenceEquals(item, Helpers.GetFirst(project.GetItems("j")))); Assert.Equal(true, Object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsIgnoringCondition("j")))); Assert.Equal(true, Object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsByEvaluatedInclude("i1")))); >>>>>>> Assert.Equal(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItems("j")))); Assert.Equal(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsIgnoringCondition("j")))); Assert.Equal(true, object.ReferenceEquals(item, Helpers.GetFirst(project.GetItemsByEvaluatedInclude("i1")))); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(true, object.ReferenceEquals(itemElement, metadatumElement1.Parent)); ======= Assert.Equal(true, Object.ReferenceEquals(itemElement, metadatumElement1.Parent)); >>>>>>> Assert.Equal(true, object.ReferenceEquals(itemElement, metadatumElement1.Parent)); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(2, Helpers.MakeList(itemGroupElement.Items).Count); Assert.AreEqual(true, object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); Assert.AreEqual(true, object.ReferenceEquals(itemGroupElement, Helpers.GetFirst(project.GetItems("i")).Xml.Parent)); ======= Assert.Equal(2, Helpers.MakeList(itemGroupElement.Items).Count); Assert.Equal(true, Object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); Assert.Equal(true, Object.ReferenceEquals(itemGroupElement, Helpers.GetFirst(project.GetItems("i")).Xml.Parent)); >>>>>>> Assert.Equal(2, Helpers.MakeList(itemGroupElement.Items).Count); Assert.Equal(true, object.ReferenceEquals(itemGroupElement, item.Xml.Parent)); Assert.Equal(true, object.ReferenceEquals(itemGroupElement, Helpers.GetFirst(project.GetItems("i")).Xml.Parent)); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidOperationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(string.Empty, instance.GetPropertyValue("p1")); Assert.AreEqual(0, Helpers.Count(project.Properties) - environmentPropertyCount); ======= Assert.Equal(String.Empty, instance.GetPropertyValue("p1")); Assert.Equal(0, Helpers.Count(project.Properties) - environmentPropertyCount); >>>>>>> Assert.Equal(String.Empty, instance.GetPropertyValue("p1")); Assert.Equal(0, Helpers.Count(project.Properties) - environmentPropertyCount); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual("m2", items[0].GetMetadataValue("m")); Assert.AreEqual(true, object.ReferenceEquals(metadatum1, metadatum2)); ======= Assert.Equal("m2", items[0].GetMetadataValue("m")); Assert.Equal(true, Object.ReferenceEquals(metadatum1, metadatum2)); >>>>>>> Assert.Equal("m2", items[0].GetMetadataValue("m")); Assert.Equal(true, object.ReferenceEquals(metadatum1, metadatum2)); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(true, object.ReferenceEquals(items[0].Xml, items[1].Xml)); Assert.AreEqual("a;b", items[0].UnevaluatedInclude); ======= Assert.Equal(true, Object.ReferenceEquals(items[0].Xml, items[1].Xml)); Assert.Equal("a;b", items[0].UnevaluatedInclude); >>>>>>> Assert.Equal(true, object.ReferenceEquals(items[0].Xml, items[1].Xml)); Assert.Equal("a;b", items[0].UnevaluatedInclude); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(FileNotFoundException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using System.Collections.Generic; using System.Diagnostics; using System.Globalization; >>>>>>> using System.Collections.Generic; using System.Diagnostics; <<<<<<< else if (normalized.Substring(0, 2) == @"\\") ======= if (normalized.StartsWith(@"\\")) >>>>>>> if (normalized.StartsWith(@"\\"))

<<<<<<< using Microsoft.Build.Shared; ======= using System; using System.Collections.Generic; using System.Text; using System.IO; using System.Reflection; using Microsoft.Build.Framework; >>>>>>> using Microsoft.Build.Shared; <<<<<<< using NUnit.Framework; ======= using System.Text.RegularExpressions; using System.Globalization; using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.GenerateSource, "GenerateSource should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/source"), false /* no response file */); ======= Assert.False(t.GenerateSource); // "GenerateSource should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/source", false /* no response file */); >>>>>>> Assert.False(t.GenerateSource); // "GenerateSource should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/source"), false /* no response file */); <<<<<<< Assert.IsTrue(t.GenerateSource, "GenerateSource should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/source"), false /* no response file */); ======= Assert.True(t.GenerateSource); // "GenerateSource should be true" CommandLine.ValidateHasParameter(t, @"/source", false /* no response file */); >>>>>>> Assert.True(t.GenerateSource); // "GenerateSource should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/source"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.Silent, "Silent should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false /* no response file */); ======= Assert.False(t.Silent); // "Silent should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/silent", false /* no response file */); >>>>>>> Assert.False(t.Silent); // "Silent should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false /* no response file */); <<<<<<< Assert.IsTrue(t.Silent, "Silent should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false /* no response file */); ======= Assert.True(t.Silent); // "Silent should be true" CommandLine.ValidateHasParameter(t, @"/silent", false /* no response file */); >>>>>>> Assert.True(t.Silent); // "Silent should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.Verbose, "Verbose should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false /* no response file */); ======= Assert.False(t.Verbose); // "Verbose should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/verbose", false /* no response file */); >>>>>>> Assert.False(t.Verbose); // "Verbose should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false /* no response file */); <<<<<<< Assert.IsTrue(t.Verbose, "Verbose should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false /* no response file */); ======= Assert.True(t.Verbose); // "Verbose should be true" CommandLine.ValidateHasParameter(t, @"/verbose", false /* no response file */); >>>>>>> Assert.True(t.Verbose); // "Verbose should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using System.Text; using Microsoft.Build.BackEnd.Logging; ======= using System.Collections.Generic; using Microsoft.Build.Evaluation; using Microsoft.Build.Execution; using Microsoft.Build.Framework; >>>>>>> using System.Collections.Generic; using System.Text; using Microsoft.Build.BackEnd.Logging; using Microsoft.Build.Execution; using Microsoft.Build.Framework; <<<<<<< using Shouldly; ======= using Shouldly; >>>>>>> using Shouldly;

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InternalErrorException))] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< NativeMethodsShared.ThrowExceptionForErrorCode(errorCode); return null; } #endif return FixFilePath(Path.GetFullPath(path)); } internal static string FixFilePath(string path) { return string.IsNullOrEmpty(path) || Path.DirectorySeparatorChar == '\\' ? path : path.Replace('\\', '/');//.Replace("//", "/"); } /// <summary> /// If on Unix, convert backslashes to slashes for strings that resemble paths. /// The heuristic is if something resembles paths (contains slashes) check if the /// first segment exists and is a directory. /// Use a native shared method to massage file path. If the file is adjusted, /// that qualifies is as a path. /// </summary> internal static string MaybeAdjustFilePath(string value) { // Don't bother with arrays or properties or network paths, or those that // have no slashes. if (NativeMethodsShared.IsWindows || string.IsNullOrEmpty(value) || value.StartsWith("$(") || value.StartsWith("@(") || value.StartsWith("\\\\") || value.IndexOfAny(new[] { '/', '\\' }) == -1) { return value; } // For Unix-like systems, we may want to convert backslashes to slashes string newValue = Regex.Replace(value, @"[\\/]+", "/"); string quote = string.Empty; // Find the part of the name we want to check, that is remove quotes, if present string checkValue = newValue; if (newValue.Length > 2) { if (newValue.StartsWith("'")) { if (newValue.EndsWith("'")) ======= /* From Path.cs in the CLR Throw an ArgumentException for paths like \\, \\server, \\server\ This check can only be properly done after normalizing, so \\foo\.. will be properly rejected. Also, reject \\?\GLOBALROOT\ (an internal kernel path) because it provides aliases for drives. throw new ArgumentException(Environment.GetResourceString("Arg_PathIllegalUNC")); // Check for \\?\Globalroot, an internal mechanism to the kernel // that provides aliases for drives and other undocumented stuff. // The kernel team won't even describe the full set of what // is available here - we don't want managed apps mucking // with this for security reasons. */ if (startIndex == finalFullPath.Length || finalFullPath.IndexOf(@"\\?\globalroot", PathComparison) != -1) >>>>>>> NativeMethodsShared.ThrowExceptionForErrorCode(errorCode); return null; } #endif return FixFilePath(Path.GetFullPath(path)); } internal static string FixFilePath(string path) { return string.IsNullOrEmpty(path) || Path.DirectorySeparatorChar == '\\' ? path : path.Replace('\\', '/');//.Replace("//", "/"); } /// <summary> /// If on Unix, convert backslashes to slashes for strings that resemble paths. /// The heuristic is if something resembles paths (contains slashes) check if the /// first segment exists and is a directory. /// Use a native shared method to massage file path. If the file is adjusted, /// that qualifies is as a path. /// </summary> internal static string MaybeAdjustFilePath(string value) { // Don't bother with arrays or properties or network paths, or those that // have no slashes. if (NativeMethodsShared.IsWindows || string.IsNullOrEmpty(value) || value.StartsWith("$(") || value.StartsWith("@(") || value.StartsWith("\\\\") || value.IndexOfAny(new[] { '/', '\\' }) == -1) { return value; } // For Unix-like systems, we may want to convert backslashes to slashes string newValue = Regex.Replace(value, @"[\\/]+", "/"); string quote = string.Empty; // Find the part of the name we want to check, that is remove quotes, if present string checkValue = newValue; if (newValue.Length > 2) { if (newValue.StartsWith("'")) { if (newValue.EndsWith("'")) <<<<<<< internal static StreamWriter OpenWrite(string path, bool append, Encoding encoding = null) { const int DefaultFileStreamBufferSize = 4096; FileMode mode = append ? FileMode.Append : FileMode.Create; Stream fileStream = new FileStream(path, mode, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamWriter(fileStream); } else { return new StreamWriter(fileStream, encoding); } } internal static StreamReader OpenRead(string path, Encoding encoding = null, bool detectEncodingFromByteOrderMarks = true) { const int DefaultFileStreamBufferSize = 4096; Stream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamReader(fileStream); } else { return new StreamReader(fileStream, encoding, detectEncodingFromByteOrderMarks); } } ======= internal static string TrimTrailingSlashes(this string s) { return s.TrimEnd('/', '\\'); } /// <summary> /// Replace all backward slashes to forward slashes /// </summary> internal static string ToSlash(this string s) { return s.Replace('\\', '/'); } internal static string NormalizeForPathComparison(this string s) => s.ToSlash().TrimTrailingSlashes(); internal static bool PathsEqual(string path1, string path2) { var trim1 = path1.TrimTrailingSlashes(); var trim2 = path2.TrimTrailingSlashes(); if (string.Equals(trim1, trim2, PathComparison)) { return true; } var slash1 = trim1.ToSlash(); var slash2 = trim2.ToSlash(); return string.Equals(slash1, slash2, PathComparison); } >>>>>>> internal static string TrimTrailingSlashes(this string s) { return s.TrimEnd('/', '\\'); } /// <summary> /// Replace all backward slashes to forward slashes /// </summary> internal static string ToSlash(this string s) { return s.Replace('\\', '/'); } internal static string NormalizeForPathComparison(this string s) => s.ToSlash().TrimTrailingSlashes(); internal static bool PathsEqual(string path1, string path2) { var trim1 = path1.TrimTrailingSlashes(); var trim2 = path2.TrimTrailingSlashes(); if (string.Equals(trim1, trim2, PathComparison)) { return true; } var slash1 = trim1.ToSlash(); var slash2 = trim2.ToSlash(); return string.Equals(slash1, slash2, PathComparison); } internal static StreamWriter OpenWrite(string path, bool append, Encoding encoding = null) { const int DefaultFileStreamBufferSize = 4096; FileMode mode = append ? FileMode.Append : FileMode.Create; Stream fileStream = new FileStream(path, mode, FileAccess.Write, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamWriter(fileStream); } else { return new StreamWriter(fileStream, encoding); } } internal static StreamReader OpenRead(string path, Encoding encoding = null, bool detectEncodingFromByteOrderMarks = true) { const int DefaultFileStreamBufferSize = 4096; Stream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize, FileOptions.SequentialScan); if (encoding == null) { return new StreamReader(fileStream); } else { return new StreamReader(fileStream, encoding, detectEncodingFromByteOrderMarks); } }

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using System.Xml; using Microsoft.Build.BackEnd; >>>>>>> using System.Xml; using Microsoft.Build.BackEnd; <<<<<<< [TestFixture] public class TaskRegistry_Tests ======= public class TaskRegistry_Tests : IClassFixture<TaskAssemblyFixture> >>>>>>> public class TaskRegistry_Tests : IClassFixture<TaskAssemblyFixture> <<<<<<< /// Set up this test class -- generate the test task assembly used by /// several of the tests. /// </summary> [TestFixtureSetUp] public static void SetupClass() { s_testTaskLocation = GetTestTaskAssemblyLocation(); } /// <summary> /// Clean this test class up -- make sure the test task assembly we /// generated has been deleted. /// </summary> [TestFixtureTearDown] public static void CleanupClass() { if (File.Exists(s_testTaskLocation)) { FileUtilities.DeleteNoThrow(s_testTaskLocation); } } /// <summary> ======= >>>>>>> <<<<<<< [SetUp] public void SetUp() ======= public TaskRegistry_Tests(TaskAssemblyFixture fixture) >>>>>>> public TaskRegistry_Tests(TaskAssemblyFixture fixture) <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact(Skip = "Test fails in xunit when multiple tests are run")] >>>>>>> [Fact(Skip = "Test fails in xunit when multiple tests are run")] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsNotInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), null, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.False(createdTask is TaskHostTask); <<<<<<< createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, new AppDomainSetup(), false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask); ======= createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.IsNotNull(createdTask); Assert.IsInstanceOf<TaskHostTask>(createdTask); >>>>>>> createdTask = _taskFactory.CreateTaskInstance(ElementLocation.Create("MSBUILD"), null, new MockHost(), taskParameters, #if FEATURE_APPDOMAIN new AppDomainSetup(), #endif false); Assert.NotNull(createdTask); Assert.IsAssignableFrom(typeof(TaskHostTask), createdTask);

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InvalidProjectFileException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< var info0 = ProcessCode(analyser, snippet0, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); var info1 = ProcessCode(analyser, snippet1, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); ======= var info = ProcessCode(analyser, sampleProgram, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); Assert.AreEqual(1, info.Allocations.Count(d => d.Id == ConcatenationAllocationAnalyzer.ValueTypeToReferenceTypeInAStringConcatenationRule.Id)); Assert.AreEqual(4, info.Allocations.Count(d => d.Id == ConcatenationAllocationAnalyzer.StringConcatenationAllocationRule.Id)); >>>>>>> var info0 = ProcessCode(analyser, snippet0, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); var info1 = ProcessCode(analyser, snippet1, ImmutableArray.Create(SyntaxKind.AddExpression, SyntaxKind.AddAssignmentExpression)); Assert.AreEqual(1, info.Allocations.Count(d => d.Id == ConcatenationAllocationAnalyzer.ValueTypeToReferenceTypeInAStringConcatenationRule.Id)); Assert.AreEqual(4, info.Allocations.Count(d => d.Id == ConcatenationAllocationAnalyzer.StringConcatenationAllocationRule.Id));

<<<<<<< using Xunit; ======= using System.Text; >>>>>>> using Xunit; using System.Text; <<<<<<< ======= #endif >>>>>>> #endif <<<<<<< Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); doc.Load(_pathToCommonTargets); doc.Save(new MemoryStream()); } ); ======= var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } #endif doc.Save(new MemoryStream()); >>>>>>> Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } #endif doc.Save(new MemoryStream()); } ); <<<<<<< Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); doc.Load(_pathToCommonTargets); doc.Save(new StringWriter()); } ); ======= var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } #endif doc.Save(new StringWriter()); >>>>>>> Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } #endif doc.Save(new StringWriter()); } ); <<<<<<< Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); doc.Load(_pathToCommonTargets); doc.Save(XmlWriter.Create(FileUtilities.GetTemporaryFile())); } ); ======= var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); doc.Save(XmlWriter.Create(FileUtilities.GetTemporaryFile())); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } using (XmlWriter wr = XmlWriter.Create(new FileStream(FileUtilities.GetTemporaryFile(), FileMode.Create))) { doc.Save(wr); } #endif >>>>>>> Assert.Throws<InvalidOperationException>(() => { var doc = new XmlDocumentWithLocation(loadAsReadOnly: true); #if FEATURE_XML_LOADPATH doc.Load(_pathToCommonTargets); doc.Save(XmlWriter.Create(FileUtilities.GetTemporaryFile())); #else using ( XmlReader xmlReader = XmlReader.Create( _pathToCommonTargets, new XmlReaderSettings { DtdProcessing = DtdProcessing.Ignore })) { doc.Load(xmlReader); } using (XmlWriter wr = XmlWriter.Create(new FileStream(FileUtilities.GetTemporaryFile(), FileMode.Create))) { doc.Save(wr); } #endif } );

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using System.Reflection; using System.Globalization; >>>>>>> <<<<<<< using NUnit.Framework; ======= using Microsoft.Build.Shared; using Xunit; >>>>>>> using Microsoft.Build.Shared; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(FileUtilities.FixFilePath(@"fr\RootNamespace.SubFolder.SplashScreen.bmp"), result); ======= Assert.Equal(@"fr\RootNamespace.SubFolder.SplashScreen.bmp", result); >>>>>>> Assert.Equal(FileUtilities.FixFilePath(@"fr\RootNamespace.SubFolder.SplashScreen.bmp"), result); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using Microsoft.Build.Framework; >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< if (NativeMethodsShared.IsUnixLike) { Assert.Ignore("File names under Unix are case-sensitive and this test is not useful"); } string currdir = Environment.CurrentDirectory; ======= string currdir = Directory.GetCurrentDirectory(); >>>>>>> if (NativeMethodsShared.IsUnixLike) { Assert.Ignore("File names under Unix are case-sensitive and this test is not useful"); } string currdir = Directory.GetCurrentDirectory();

<<<<<<< [Test] ======= /// </summary> [TestMethod] >>>>>>> /// </summary> [Test]

<<<<<<< else if (_panelProfileHandler.Airframe == DCSAirframe.M2000C) { var radioPanelPZ69UserControl = new RadioPanelPZ69UserControlM2000C(hidSkeleton, tabItem, this); _saitekUserControls.Add(radioPanelPZ69UserControl); _panelProfileHandler.Attach(radioPanelPZ69UserControl); tabItem.Content = radioPanelPZ69UserControl; TabControlPanels.Items.Add(tabItem); } ======= //else if (_panelProfileHandler.Airframe == DCSAirframe.F5E) //{ // var radioPanelPZ69UserControl = new RadioPanelPZ69UserControlF5E(hidSkeleton, tabItem, this); // _saitekUserControls.Add(radioPanelPZ69UserControl); // _panelProfileHandler.Attach(radioPanelPZ69UserControl); // tabItem.Content = radioPanelPZ69UserControl; // TabControlPanels.Items.Add(tabItem); //} >>>>>>> else if (_panelProfileHandler.Airframe == DCSAirframe.M2000C) { var radioPanelPZ69UserControl = new RadioPanelPZ69UserControlM2000C(hidSkeleton, tabItem, this); _saitekUserControls.Add(radioPanelPZ69UserControl); _panelProfileHandler.Attach(radioPanelPZ69UserControl); tabItem.Content = radioPanelPZ69UserControl; TabControlPanels.Items.Add(tabItem); } //else if (_panelProfileHandler.Airframe == DCSAirframe.F5E) //{ // var radioPanelPZ69UserControl = new RadioPanelPZ69UserControlF5E(hidSkeleton, tabItem, this); // _saitekUserControls.Add(radioPanelPZ69UserControl); // _panelProfileHandler.Attach(radioPanelPZ69UserControl); // tabItem.Content = radioPanelPZ69UserControl; // TabControlPanels.Items.Add(tabItem); //}

<<<<<<< RegexOptions.IgnoreCase ); /* var matches = Regex.Matches(currentLine, "(?<File>.*):(?<Line>\\d+):(?<Character>\\d+):(?<Type> error| warning):(?<Message>.*)"); */ static private Regex s_originCategoryCodeTextExpression2 = new Regex ( @"^\s*(?<ORIGIN>(?<FILENAME>.*):(?<LOCATION>(?<LINE>[0-9]*):(?<COLUMN>[0-9]*))):(?<CATEGORY> error| warning):(?<TEXT>.*)", RegexOptions.IgnoreCase ); ======= RegexOptions.IgnoreCase | RegexOptions.Compiled )); >>>>>>> RegexOptions.IgnoreCase | RegexOptions.Compiled )); private static readonly Lazy<Regex> s_originCategoryCodeTextExpression2 = new Lazy<Regex>( () => new Regex ( @"^\s*(?<ORIGIN>(?<FILENAME>.*):(?<LOCATION>(?<LINE>[0-9]*):(?<COLUMN>[0-9]*))):(?<CATEGORY> error| warning):(?<TEXT>.*)", RegexOptions.IgnoreCase | RegexOptions.Compiled )); <<<<<<< Match match = s_originCategoryCodeTextExpression.Match(message); string category; ======= Match match = s_originCategoryCodeTextExpression.Value.Match(message); >>>>>>> Match match = s_originCategoryCodeTextExpression.Value.Match(message); string category;

<<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] public class Preprocessor_Tests ======= public class Preprocessor_Tests : IDisposable >>>>>>> public class Preprocessor_Tests : IDisposable <<<<<<< [SetUp] ======= >>>>>>> <<<<<<< [TearDown] public void Teardown() ======= public void Dispose() >>>>>>> public void Dispose() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using System.IO; ======= >>>>>>> using System.IO; <<<<<<< using NUnit.Framework; ======= using Microsoft.Build.Shared; using Xunit; >>>>>>> using Xunit; <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using System.Reflection; using Microsoft.Build.Framework; >>>>>>> using System.Reflection; using Microsoft.Build.Framework; <<<<<<< using NUnit.Framework; ======= using System.Text.RegularExpressions; using System.Globalization; using Xunit; >>>>>>> using System.Text.RegularExpressions; using System.Globalization; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual("Agnostic", t.Machine, "New TypeLibName value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch("/machine:Agnostic"), false /* no response file */); ======= Assert.Equal("Agnostic", t.Machine); // "New TypeLibName value should be set" CommandLine.ValidateHasParameter(t, "/machine:Agnostic", false /* no response file */); >>>>>>> Assert.Equal("Agnostic", t.Machine); // "New TypeLibName value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch("/machine:Agnostic"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.AssemblyNamespace, "AssemblyNamespace should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/namespace:"), false /* no response file */); ======= Assert.Null(t.AssemblyNamespace); // "AssemblyNamespace should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/namespace:", false /* no response file */); >>>>>>> Assert.Null(t.AssemblyNamespace); // "AssemblyNamespace should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/namespace:"), false /* no response file */); <<<<<<< Assert.AreEqual(testParameterValue, t.AssemblyNamespace, "New AssemblyNamespace value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/namespace:") + testParameterValue, false /* no response file */); ======= Assert.Equal(testParameterValue, t.AssemblyNamespace); // "New AssemblyNamespace value should be set" CommandLine.ValidateHasParameter(t, @"/namespace:" + testParameterValue, false /* no response file */); >>>>>>> Assert.Equal(testParameterValue, t.AssemblyNamespace); // "New AssemblyNamespace value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/namespace:") + testParameterValue, false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsNull(t.AssemblyVersion, "AssemblyVersion should be null by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/asmversion:"), false /* no response file */); ======= Assert.Null(t.AssemblyVersion); // "AssemblyVersion should be null by default" CommandLine.ValidateNoParameterStartsWith(t, @"/asmversion:", false /* no response file */); >>>>>>> Assert.Null(t.AssemblyVersion); // "AssemblyVersion should be null by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/asmversion:"), false /* no response file */); <<<<<<< Assert.AreEqual(testParameterValue, t.AssemblyVersion, "New AssemblyNamespace value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/asmversion:") + testParameterValue.ToString(), false /* no response file */); ======= Assert.Equal(testParameterValue, t.AssemblyVersion); // "New AssemblyNamespace value should be set" CommandLine.ValidateHasParameter(t, @"/asmversion:" + testParameterValue.ToString(), false /* no response file */); >>>>>>> Assert.Equal(testParameterValue, t.AssemblyVersion); // "New AssemblyNamespace value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/asmversion:") + testParameterValue.ToString(), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.NoLogo, "NoLogo should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/nologo"), false /* no response file */); ======= Assert.False(t.NoLogo); // "NoLogo should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/nologo", false /* no response file */); >>>>>>> Assert.False(t.NoLogo); // "NoLogo should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/nologo"), false /* no response file */); <<<<<<< Assert.IsTrue(t.NoLogo, "NoLogo should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/nologo"), false /* no response file */); ======= Assert.True(t.NoLogo); // "NoLogo should be true" CommandLine.ValidateHasParameter(t, @"/nologo", false /* no response file */); >>>>>>> Assert.True(t.NoLogo); // "NoLogo should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/nologo"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.PreventClassMembers, "PreventClassMembers should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/noclassmembers"), false /* no response file */); ======= Assert.False(t.PreventClassMembers); // "PreventClassMembers should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/noclassmembers", false /* no response file */); >>>>>>> Assert.False(t.PreventClassMembers); // "PreventClassMembers should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/noclassmembers"), false /* no response file */); <<<<<<< Assert.IsTrue(t.PreventClassMembers, "PreventClassMembers should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/noclassmembers"), false /* no response file */); ======= Assert.True(t.PreventClassMembers); // "PreventClassMembers should be true" CommandLine.ValidateHasParameter(t, @"/noclassmembers", false /* no response file */); >>>>>>> Assert.True(t.PreventClassMembers); // "PreventClassMembers should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/noclassmembers"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.SafeArrayAsSystemArray, "SafeArrayAsSystemArray should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/sysarray"), false /* no response file */); ======= Assert.False(t.SafeArrayAsSystemArray); // "SafeArrayAsSystemArray should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/sysarray", false /* no response file */); >>>>>>> Assert.False(t.SafeArrayAsSystemArray); // "SafeArrayAsSystemArray should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/sysarray"), false /* no response file */); <<<<<<< Assert.IsTrue(t.SafeArrayAsSystemArray, "SafeArrayAsSystemArray should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/sysarray"), false /* no response file */); ======= Assert.True(t.SafeArrayAsSystemArray); // "SafeArrayAsSystemArray should be true" CommandLine.ValidateHasParameter(t, @"/sysarray", false /* no response file */); >>>>>>> Assert.True(t.SafeArrayAsSystemArray); // "SafeArrayAsSystemArray should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/sysarray"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.Silent, "Silent should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false /* no response file */); ======= Assert.False(t.Silent); // "Silent should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/silent", false /* no response file */); >>>>>>> Assert.False(t.Silent); // "Silent should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false /* no response file */); <<<<<<< Assert.IsTrue(t.Silent, "Silent should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false /* no response file */); ======= Assert.True(t.Silent); // "Silent should be true" CommandLine.ValidateHasParameter(t, @"/silent", false /* no response file */); >>>>>>> Assert.True(t.Silent); // "Silent should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/silent"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual(ResolveComReference.TlbImpTransformFlags.None, t.Transform, "Transform should be TlbImpTransformFlags.None by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:"), false /* no response file */); ======= Assert.Equal(ResolveComReference.TlbImpTransformFlags.None, t.Transform); // "Transform should be TlbImpTransformFlags.None by default" CommandLine.ValidateNoParameterStartsWith(t, @"/transform:", false /* no response file */); >>>>>>> Assert.Equal(ResolveComReference.TlbImpTransformFlags.None, t.Transform); // "Transform should be TlbImpTransformFlags.None by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:"), false /* no response file */); <<<<<<< Assert.AreEqual(dispRet, t.Transform, "New Transform value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:DispRet"), false /* no response file */); ======= Assert.Equal(dispRet, t.Transform); // "New Transform value should be set" CommandLine.ValidateHasParameter(t, @"/transform:DispRet", false /* no response file */); >>>>>>> Assert.Equal(dispRet, t.Transform); // "New Transform value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:DispRet"), false /* no response file */); <<<<<<< Assert.AreEqual(serialize, t.Transform, "New Transform value should be set"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:SerializableValueClasses"), false /* no response file */); ======= Assert.Equal(serialize, t.Transform); // "New Transform value should be set" CommandLine.ValidateHasParameter(t, @"/transform:SerializableValueClasses", false /* no response file */); >>>>>>> Assert.Equal(serialize, t.Transform); // "New Transform value should be set" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/transform:SerializableValueClasses"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.IsFalse(t.Verbose, "Verbose should be false by default"); CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false /* no response file */); ======= Assert.False(t.Verbose); // "Verbose should be false by default" CommandLine.ValidateNoParameterStartsWith(t, @"/verbose", false /* no response file */); >>>>>>> Assert.False(t.Verbose); // "Verbose should be false by default" CommandLine.ValidateNoParameterStartsWith( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false /* no response file */); <<<<<<< Assert.IsTrue(t.Verbose, "Verbose should be true"); CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false /* no response file */); ======= Assert.True(t.Verbose); // "Verbose should be true" CommandLine.ValidateHasParameter(t, @"/verbose", false /* no response file */); >>>>>>> Assert.True(t.Verbose); // "Verbose should be true" CommandLine.ValidateHasParameter( t, CommandLineBuilder.FixCommandLineSwitch(@"/verbose"), false /* no response file */); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using System.Text; >>>>>>> using System.Text; <<<<<<< using System.Text; ======= >>>>>>> <<<<<<< using (StreamWriter sw = new StreamWriter(_batchFile, false, isUnix ? Encoding.ASCII : EncodingUtilities.CurrentSystemOemEncoding)) // HIGHCHAR: Exec task batch files are in OEM code pages (not ANSI!) { if (!isUnix) ======= // Note: 8/12/15 - Switched to use UTF8 on OS newer than 6.1 (Windows 7) using (StreamWriter sw = new StreamWriter(_batchFile, false, GetEncodingWithOsFallback())) { // In some wierd setups, users may have set an env var actually called "errorlevel" // this would cause our "exit %errorlevel%" to return false. // This is because the actual errorlevel value is not an environment variable, but some commands, // such as "exit %errorlevel%" will use the environment variable with that name if it exists, instead // of the actual errorlevel value. So we must temporarily reset errorlevel locally first. sw.WriteLine("setlocal"); // One more wrinkle. // "set foo=" has odd behavior: it sets errorlevel to 1 if there was no environment variable named // "foo" defined. // This has the effect of making "set errorlevel=" set an errorlevel of 1 if an environment // variable named "errorlevel" didn't already exist! // To avoid this problem, set errorlevel locally to a dummy value first. sw.WriteLine("set errorlevel=dummy"); sw.WriteLine("set errorlevel="); // We probably have to change the code page to UTF8 (65001) for non-ansi characters to work. if (EncodingUtilities.CurrentSystemOemEncoding.CodePage != sw.Encoding.CodePage) { // Output to nul so we don't change output and logs. sw.WriteLine(string.Format("chcp {0}>nul", sw.Encoding.CodePage)); } // if the working directory is a UNC path, bracket the exec command with pushd and popd, because pushd // automatically maps the network path to a drive letter, and then popd disconnects it if (workingDirectoryIsUNC) >>>>>>> // Note: 8/12/15 - Switched to use UTF8 on OS newer than 6.1 (Windows 7) using (StreamWriter sw = new StreamWriter(_batchFile, false, GetEncodingWithOsFallback())) { if (!isUnix)

<<<<<<< ======= using System.Configuration; using System.IO; using System.Xml; >>>>>>> using System.Configuration; using System.IO; using System.Xml; <<<<<<< using NUnit.Framework; ======= using Microsoft.Build.Unittest; using Xunit; >>>>>>> using Microsoft.Build.Unittest; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentNullException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [Ignore] ======= [Fact(Skip = "Ignored in MSTest")] >>>>>>> [Fact(Skip = "Ignored in MSTest")] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] //[Ignore("TEST: INSTALLED BUILD PROCESS")] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires dependent components (e.g. csc2.exe). ======= [TestMethod] >>>>>>> [Test]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< private static readonly ResourceManager s_resources = new ResourceManager("Microsoft.Build.Resources.Strings", typeof(AssemblyResources).GetTypeInfo().Assembly); ======= private static readonly ResourceManager s_resources = new ResourceManager("Microsoft.Build.Strings", Assembly.GetExecutingAssembly()); >>>>>>> private static readonly ResourceManager s_resources = new ResourceManager("Microsoft.Build.Strings", typeof(AssemblyResources).GetTypeInfo().Assembly); <<<<<<< private static readonly ResourceManager s_sharedResources = new ResourceManager("Microsoft.Build.Resources.Strings.shared", typeof(AssemblyResources).GetTypeInfo().Assembly); ======= private static readonly ResourceManager s_sharedResources = new ResourceManager("Microsoft.Build.Strings.shared", Assembly.GetExecutingAssembly()); >>>>>>> private static readonly ResourceManager s_sharedResources = new ResourceManager("Microsoft.Build.Strings.shared", typeof(AssemblyResources).GetTypeInfo().Assembly);

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] public void SimpleValidArguments() ======= [Fact] public void SimpleValidArgumentsCommandLine() >>>>>>> [Fact] public void SimpleValidArgumentsCommandLine() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using System.IO; using Xunit; ======= >>>>>>> using System.IO; using Xunit; <<<<<<< Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration(1, Directory.GetCurrentDirectory(), null, Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, null, 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, null, @"c:\my tasks\mytask.dll", null); } ); ======= TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, null, #if FEATURE_ASSEMBLY_LOADFROM @"c:\my tasks\mytask.dll", #else new AssemblyName("mytask"), #endif null); >>>>>>> Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, null, #if FEATURE_ASSEMBLY_LOADFROM @"c:\my tasks\mytask.dll", #else new AssemblyName("mytask"), #endif null); } ); <<<<<<< Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration(1, Directory.GetCurrentDirectory(), null, Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, null, 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, String.Empty, @"c:\my tasks\mytask.dll", null); } ); ======= TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, String.Empty, #if FEATURE_ASSEMBLY_LOADFROM @"c:\my tasks\mytask.dll", #else new AssemblyName("mytask"), #endif null); >>>>>>> Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, String.Empty, #if FEATURE_ASSEMBLY_LOADFROM @"c:\my tasks\mytask.dll", #else new AssemblyName("mytask"), #endif null); } ); <<<<<<< Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration(1, Directory.GetCurrentDirectory(), null, Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, null, 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", null, null); } ); ======= TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", null, null); >>>>>>> Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", null, null); } ); <<<<<<< Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration(1, Directory.GetCurrentDirectory(), null, Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, null, 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", String.Empty, null); } ); ======= TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", #if FEATURE_ASSEMBLY_LOADFROM String.Empty, #else new AssemblyName(String.Empty), #endif null); >>>>>>> Assert.Throws<InternalErrorException>(() => { TaskHostConfiguration config = new TaskHostConfiguration( 1, Directory.GetCurrentDirectory(), null, #if FEATURE_THREAD_CULTURE Thread.CurrentThread.CurrentCulture, Thread.CurrentThread.CurrentUICulture, #else CultureInfo.CurrentCulture, CultureInfo.CurrentCulture, #endif #if FEATURE_APPDOMAIN null, #endif 1, 1, @"c:\my project\myproj.proj", _continueOnErrorDefault, "TaskName", #if FEATURE_ASSEMBLY_LOADFROM String.Empty, #else new AssemblyName(String.Empty), #endif null); } ); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.Null(deserializedConfig.TaskParameters); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNull(deserializedConfig.TaskParameters); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.Null(deserializedConfig.TaskParameters); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNotNull(deserializedConfig.TaskParameters); Assert.AreEqual(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); Assert.Equal(config.TaskParameters["Text"].WrappedParameter, deserializedConfig.TaskParameters["Text"].WrappedParameter); Assert.Equal(config.TaskParameters["BoolValue"].WrappedParameter, deserializedConfig.TaskParameters["BoolValue"].WrappedParameter); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNotNull(deserializedConfig.TaskParameters); Assert.AreEqual(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); Assert.AreEqual(config.TaskParameters["Text"].WrappedParameter, deserializedConfig.TaskParameters["Text"].WrappedParameter); Assert.AreEqual(config.TaskParameters["BoolValue"].WrappedParameter, deserializedConfig.TaskParameters["BoolValue"].WrappedParameter); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); Assert.Equal(config.TaskParameters["Text"].WrappedParameter, deserializedConfig.TaskParameters["Text"].WrappedParameter); Assert.Equal(config.TaskParameters["BoolValue"].WrappedParameter, deserializedConfig.TaskParameters["BoolValue"].WrappedParameter); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNotNull(deserializedConfig.TaskParameters); Assert.AreEqual(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); <<<<<<< Assert.Equal(config.TaskName, deserializedConfig.TaskName); Assert.Equal(config.TaskLocation, config.TaskLocation); Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); ======= Assert.AreEqual(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.AreEqual(config.TaskLocation, config.TaskLocation); #endif Assert.IsNotNull(deserializedConfig.TaskParameters); Assert.AreEqual(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count); >>>>>>> Assert.Equal(config.TaskName, deserializedConfig.TaskName); #if FEATURE_ASSEMBLY_LOADFROM Assert.Equal(config.TaskLocation, config.TaskLocation); #endif Assert.NotNull(deserializedConfig.TaskParameters); Assert.Equal(config.TaskParameters.Count, deserializedConfig.TaskParameters.Count);

<<<<<<< internal static string dotNetFrameworkVersionFolderPrefixV30 = NativeMethodsShared.IsWindows ? "v3.0" : "3.0"; // v3.0 is for WinFx. private const string dotNetFrameworkVersionV30 = "v3.0"; // full WinFx version to pass to NativeMethodsShared.GetRequestedRuntimeInfo(). private static string s_dotNetFrameworkAssemblyFoldersRegistryKeyV30 = dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30; private static string s_dotNetFrameworkRegistryKeyV30 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30 + "\\Setup"; ======= internal const string dotNetFrameworkVersionFolderPrefixV30 = "v3.0"; // v3.0 is for WinFx. private const string dotNetFrameworkRegistryKeyV30 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30 + "\\Setup"; >>>>>>> internal static string dotNetFrameworkVersionFolderPrefixV30 = NativeMethodsShared.IsWindows ? "v3.0" : "3.0"; // v3.0 is for WinFx. private static string s_dotNetFrameworkRegistryKeyV30 = dotNetFrameworkSetupRegistryPath + "\\" + dotNetFrameworkVersionFolderPrefixV30 + "\\Setup"; <<<<<<< if (NativeMethodsShared.IsWindows) { var endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith( Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal); ======= bool endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith("\\", StringComparison.Ordinal); >>>>>>> if (NativeMethodsShared.IsWindows) { var endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith( Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal); <<<<<<< if (NativeMethodsShared.IsWindows) { bool endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith( "\\", StringComparison.Ordinal); ======= bool endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith("\\", StringComparison.Ordinal); >>>>>>> if (NativeMethodsShared.IsWindows) { bool endsWithASlash = FallbackDotNetFrameworkSdkInstallPath.EndsWith( "\\", StringComparison.Ordinal); <<<<<<< /// <param name="directoryExists">Function that checks if directory exists.</param> ======= /// <param name="directoryExists">Delegate to method that can check for the existence of a file.</param> >>>>>>> /// <param name="directoryExists">Function that checks if directory exists.</param> <<<<<<< /// <param name="architecture">Required architecture.</param> ======= /// <param name="architecture">.NET framework architecture</param> >>>>>>> /// <param name="architecture">.NET framework architecture</param> <<<<<<< // Record whether we had a slash or not so that we can tack it back on if necessary var endedWithASlash = path.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal) || path.EndsWith( Path.AltDirectorySeparatorChar.ToString(), StringComparison.Ordinal); ======= bool endedWithASlash = path.EndsWith("\\", StringComparison.OrdinalIgnoreCase); >>>>>>> // Record whether we had a slash or not so that we can tack it back on if necessary var endedWithASlash = path.EndsWith(Path.DirectorySeparatorChar.ToString(), StringComparison.Ordinal) || path.EndsWith( Path.AltDirectorySeparatorChar.ToString(), StringComparison.Ordinal); <<<<<<< protected string pathToWindowsSdk; #endif ======= private string _pathToWindowsSdk; >>>>>>> private string _pathToWindowsSdk; #endif <<<<<<< if (NativeMethodsShared.IsWindows) ======= if (!CheckForFrameworkInstallation(this._dotNetFrameworkRegistryKey, this._dotNetFrameworkSetupRegistryInstalledName)) >>>>>>> if (NativeMethodsShared.IsWindows) <<<<<<< // Fallback mechanisms. // Try to find explicit fallback rule. // i.e. v4.5.1 on VS12 fallbacks to v4.5 on VS12. bool foundExplicitRule = false; for (int i = 0; i < s_explicitFallbackRulesForPathToDotNetFrameworkSdkTools.GetLength(0); ++i) ======= var trigger = s_explicitFallbackRulesForPathToDotNetFrameworkSdkTools[i, 0]; if (trigger.Item1 == this.Version && trigger.Item2 == visualStudioSpec.Version) >>>>>>> // Fallback mechanisms. // Try to find explicit fallback rule. // i.e. v4.5.1 on VS12 fallbacks to v4.5 on VS12. bool foundExplicitRule = false; for (int i = 0; i < s_explicitFallbackRulesForPathToDotNetFrameworkSdkTools.GetLength(0); ++i) <<<<<<< int index = Array.IndexOf(s_visualStudioSpecs, visualStudioSpec); if (index > 0) { // The items in the array "visualStudioSpecs" must be ordered by version. That would allow us to fallback to the previous visual studio version easily. VisualStudioSpec fallbackVisualStudioSpec = s_visualStudioSpecs[index - 1]; generatedPathToDotNetFrameworkSdkTools = FallbackToPathToDotNetFrameworkSdkToolsInPreviousVersion( this.version, fallbackVisualStudioSpec.Version); } ======= // The items in the array "visualStudioSpecs" must be ordered by version. That would allow us to fallback to the previous visual studio version easily. VisualStudioSpec fallbackVisualStudioSpec = s_visualStudioSpecs[index - 1]; generatedPathToDotNetFrameworkSdkTools = FallbackToPathToDotNetFrameworkSdkToolsInPreviousVersion(this.Version, fallbackVisualStudioSpec.Version); >>>>>>> int index = Array.IndexOf(s_visualStudioSpecs, visualStudioSpec); if (index > 0) { // The items in the array "visualStudioSpecs" must be ordered by version. That would allow us to fallback to the previous visual studio version easily. VisualStudioSpec fallbackVisualStudioSpec = s_visualStudioSpecs[index - 1]; generatedPathToDotNetFrameworkSdkTools = FallbackToPathToDotNetFrameworkSdkToolsInPreviousVersion( this.version, fallbackVisualStudioSpec.Version); } <<<<<<< #if FEATURE_WIN32_REGISTRY if (this.pathToWindowsSdk == null) ======= if (this._pathToWindowsSdk == null) >>>>>>> #if FEATURE_WIN32_REGISTRY if (this._pathToWindowsSdk == null) <<<<<<< return this.pathToWindowsSdk; #else return null; #endif ======= return this._pathToWindowsSdk; >>>>>>> return this._pathToWindowsSdk; #else return null; #endif <<<<<<< #if FEATURE_WIN32_REGISTRY this.pathToDotNetFrameworkReferenceAssemblies = FindRegistryValueUnderKey( dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + this.dotNetFrameworkFolderPrefix, ======= this._pathToDotNetFrameworkReferenceAssemblies = FindRegistryValueUnderKey( dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + this.DotNetFrameworkFolderPrefix, >>>>>>> #if FEATURE_WIN32_REGISTRY this._pathToDotNetFrameworkReferenceAssemblies = FindRegistryValueUnderKey( dotNetFrameworkAssemblyFoldersRegistryPath + "\\" + this.dotNetFrameworkFolderPrefix,

<<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test]

<<<<<<< using System.Reflection; ======= using Microsoft.Build.Internal; >>>>>>> using Microsoft.Build.Internal; using System.Reflection;

<<<<<<< internal static HandshakeOptions GetHandshakeOptions(bool taskHost, bool is64Bit = false, int clrVersion = 0, bool nodeReuse = false, bool lowPriority = false, bool workerNode = true, IDictionary<string, string> taskHostParameters = null) ======= internal static HandshakeOptions GetHandshakeOptions(bool taskHost, bool is64Bit = false, bool nodeReuse = false, bool lowPriority = false, IDictionary<string, string> taskHostParameters = null) >>>>>>> internal static HandshakeOptions GetHandshakeOptions(bool taskHost, bool is64Bit = false, bool nodeReuse = false, bool lowPriority = false, bool workerNode = true, IDictionary<string, string> taskHostParameters = null) <<<<<<< internal static string GetRARPipeName(bool nodeReuse, bool lowPriority) { var context = HandshakeOptions.None; var userName = Environment.UserName; var clrVersion = typeof(bool).GetTypeInfo().Assembly.GetName().Version.Major; var is64Bit = XMakeAttributes.GetCurrentMSBuildArchitecture().Equals(XMakeAttributes.MSBuildArchitectureValues.x64); if (is64Bit) { context |= HandshakeOptions.X64; } if (clrVersion == 2) { context |= HandshakeOptions.CLR2; } if (nodeReuse) { context |= HandshakeOptions.NodeReuse; } if (lowPriority) { context |= HandshakeOptions.LowPriority; } return $"MSBuild.RAR.{userName}.{(int)context}"; } ======= internal static int AvoidEndOfHandshakeSignal(int x) { return x == EndOfHandshakeSignal ? ~x : x; } >>>>>>> internal static int AvoidEndOfHandshakeSignal(int x) { return x == EndOfHandshakeSignal ? ~x : x; } internal static string GetRARPipeName(bool nodeReuse, bool lowPriority) { var context = HandshakeOptions.None; var userName = Environment.UserName; var clrVersion = typeof(bool).GetTypeInfo().Assembly.GetName().Version.Major; var is64Bit = XMakeAttributes.GetCurrentMSBuildArchitecture().Equals(XMakeAttributes.MSBuildArchitectureValues.x64); if (is64Bit) { context |= HandshakeOptions.X64; } if (clrVersion == 2) { context |= HandshakeOptions.CLR2; } if (nodeReuse) { context |= HandshakeOptions.NodeReuse; } if (lowPriority) { context |= HandshakeOptions.LowPriority; } return $"MSBuild.RAR.{userName}.{(int)context}"; }

<<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("FEATURE: LEGACY TASKS")] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("FEATURE: LEGACY TASKS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] [Ignore] // Ignore: Needs investigation, doesn't like Task.v4.0.dll >>>>>>> [Test] <<<<<<< [Test] [Ignore("FEATURE: LEGACY TASKS")] // Ignore: Changes to the current directory interfere with the toolset reader. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] ======= [TestMethod] >>>>>>> [Test]

<<<<<<< ======= using Microsoft.Build.Shared; >>>>>>> using Microsoft.Build.Shared; <<<<<<< using Microsoft.Build.Shared; using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= using System.IO; using System.Reflection; using System.Collections; >>>>>>> using System.IO; using System.Reflection; using System.Collections; <<<<<<< using NUnit.Framework; ======= using System.Text.RegularExpressions; using Xunit; >>>>>>> using System.Text.RegularExpressions; using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] [ExpectedException(typeof(ArgumentException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< ); Assert.AreEqual(CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MyResource.bmp,Kenny,Private"), c.ToString()); ======= ); // <-- Expect an ArgumentException here. >>>>>>> ); // <-- Expect an ArgumentException here. <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< Assert.AreEqual( CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MySoundEffect.wav,Kenny ") + CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MySplashScreen.bmp,Cartman,c:\foo,Public"), c.ToString()); ======= Assert.Equal(@"/myswitch:MySoundEffect.wav,Kenny /myswitch:MySplashScreen.bmp,Cartman,c:\foo,Public", c.ToString()); >>>>>>> Assert.Equal( CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MySoundEffect.wav,Kenny ") + CommandLineBuilder.FixCommandLineSwitch(@"/myswitch:MySplashScreen.bmp,Cartman,c:\foo,Public"), c.ToString());

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using System.Xml; using Microsoft.Build.BackEnd; ======= using System.Reflection; >>>>>>> using System.Xml; using Microsoft.Build.BackEnd; <<<<<<< Assert.Throws<InvalidProjectFileException>(() => { // Note output is false so these are only input parameters string output = bool.FalseString; string required = bool.TrueString; string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).Assembly.FullName; List<ProjectUsingTaskElement> elementList = CreateParameterElementWithAttributes(output, required, type); TaskRegistry registry = TaskRegistryHelperMethods<ProjectPropertyInstance, ProjectItemInstance>.CreateTaskRegistryAndRegisterTasks(elementList); Assert.True(false); } ); ======= // Note output is false so these are only input parameters string output = bool.FalseString; string required = bool.TrueString; #if FEATURE_ASSEMBLY_LOCATION string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).Assembly.FullName; #else string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).GetTypeInfo().Assembly.FullName; #endif List<ProjectUsingTaskElement> elementList = CreateParameterElementWithAttributes(output, required, type); TaskRegistry registry = TaskRegistryHelperMethods<ProjectPropertyInstance, ProjectItemInstance>.CreateTaskRegistryAndRegisterTasks(elementList); Assert.Fail(); >>>>>>> Assert.Throws<InvalidProjectFileException>(() => { // Note output is false so these are only input parameters string output = bool.FalseString; string required = bool.TrueString; #if FEATURE_ASSEMBLY_LOCATION string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).Assembly.FullName; #else string type = type = typeof(DerivedFromITaskItem).FullName + "," + typeof(DerivedFromITaskItem).GetTypeInfo().Assembly.FullName; #endif List<ProjectUsingTaskElement> elementList = CreateParameterElementWithAttributes(output, required, type); TaskRegistry registry = TaskRegistryHelperMethods<ProjectPropertyInstance, ProjectItemInstance>.CreateTaskRegistryAndRegisterTasks(elementList); Assert.True(false); } ); <<<<<<< Assert.NotNull(parameterInfo); Assert.Equal(parameterInfo.Name, filledOutAttributesParameter.Name); Assert.Equal(parameterInfo.Output, bool.Parse(expandedOutput)); Assert.Equal(parameterInfo.Required, bool.Parse(expandedRequired)); Assert.Equal(parameterInfo.PropertyType, Type.GetType(expandedType + "," + typeof(ITaskItem).Assembly.FullName, false /* don't throw on error */, true /* case-insensitive */)); ======= Assert.IsNotNull(parameterInfo); Assert.AreEqual(parameterInfo.Name, filledOutAttributesParameter.Name); Assert.AreEqual(parameterInfo.Output, bool.Parse(expandedOutput)); Assert.AreEqual(parameterInfo.Required, bool.Parse(expandedRequired)); Assert.AreEqual( parameterInfo.PropertyType, Type.GetType( #if FEATURE_ASSEMBLY_LOCATION expandedType + "," + typeof(ITaskItem).Assembly.FullName, #else expandedType + "," + typeof(ITaskItem).GetTypeInfo().Assembly.FullName, #endif false /* don't throw on error */, true /* case-insensitive */)); >>>>>>> Assert.NotNull(parameterInfo); Assert.Equal(parameterInfo.Name, filledOutAttributesParameter.Name); Assert.Equal(parameterInfo.Output, bool.Parse(expandedOutput)); Assert.Equal(parameterInfo.Required, bool.Parse(expandedRequired)); Assert.Equal( parameterInfo.PropertyType, Type.GetType( #if FEATURE_ASSEMBLY_LOCATION expandedType + "," + typeof(ITaskItem).Assembly.FullName, #else expandedType + "," + typeof(ITaskItem).GetTypeInfo().Assembly.FullName, #endif false /* don't throw on error */, true /* case-insensitive */));

<<<<<<< using NUnit.Framework; ======= using Xunit; >>>>>>> using Xunit; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [TestFixtureSetUp] public static void Setup() ======= public CommandLineSwitchesTests() >>>>>>> public CommandLineSwitchesTests() <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< #if !MONO [Test] ======= [Fact] >>>>>>> #if !MONO [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< #if !MONO && FEATURE_APPDOMAIN [Test] ======= [Fact] >>>>>>> #if !MONO && FEATURE_APPDOMAIN [Fact] <<<<<<< #if FEATURE_XML_SCHEMA_VALIDATION [Test] ======= [Fact] >>>>>>> #if FEATURE_XML_SCHEMA_VALIDATION [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] [ExpectedException(typeof(InitializationException))] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< ======= // NOTES: // 1) there's a bug in the Process class where the exit code is not returned properly i.e. if the command // fails with exit code 9009, Process.ExitCode returns 1 -- the statement below forces it to return the // correct exit code // 2) also because of another (or perhaps the same) bug in the Process class, when we use pushd/popd for a // UNC path, even if the command fails, the exit code comes back as 0 (seemingly reflecting the success // of popd) -- the statement below fixes that too // 3) the above described behavior is most likely bugs in the Process class because batch files in a // console window do not hide or change the exit code a.k.a. errorlevel, esp. since the popd command is // a no-fail command, and it never changes the previous errorlevel sw.WriteLine("exit %errorlevel%"); >>>>>>> <<<<<<< /// Get encoding based on OS. This will fall back to previous behavior on Windows before Windows 7. /// If the OS is greater than or equal to Windows 7, UTF8 encoding will be used for the cmd file. /// On unices, use ASCII. ======= /// Find the encoding for the batch file. >>>>>>> /// Find the encoding for the batch file. <<<<<<< #if FEATURE_OSVERSION if (!NativeMethodsShared.IsWindows) { return s_utf8WithoutBom; } // Windows 7 (6.1) or greater ======= var defaultEncoding = EncodingUtilities.CurrentSystemOemEncoding; string useUtf8 = string.IsNullOrEmpty(UseUtf8Encoding) ? UseUtf8Detect : UseUtf8Encoding; // UTF8 is only supposed in Windows 7 (6.1) or greater. >>>>>>> #if FEATURE_OSVERSION if (!NativeMethodsShared.IsWindows) { return s_utf8WithoutBom; } var defaultEncoding = EncodingUtilities.CurrentSystemOemEncoding; string useUtf8 = string.IsNullOrEmpty(UseUtf8Encoding) ? UseUtf8Detect : UseUtf8Encoding; // UTF8 is only supposed in Windows 7 (6.1) or greater. <<<<<<< return Environment.OSVersion.Version >= windows7 ? s_utf8WithoutBom : EncodingUtilities.CurrentSystemOemEncoding; #else return s_utf8WithoutBom; #endif ======= if (Environment.OSVersion.Version < windows7) { useUtf8 = UseUtf8Never; } switch (useUtf8.ToUpperInvariant()) { case UseUtf8Always: return s_utf8WithoutBom; case UseUtf8Never: return EncodingUtilities.CurrentSystemOemEncoding; default: return CanEncodeString(defaultEncoding.CodePage, Command + WorkingDirectory) ? defaultEncoding : s_utf8WithoutBom; } } /// <summary> /// Checks to see if a string can be encoded in a specified code page. /// </summary> /// <remarks>Internal for testing purposes.</remarks> /// <param name="codePage">Code page for encoding.</param> /// <param name="stringToEncode">String to encode.</param> /// <returns>True if the string can be encoded in the specified code page.</returns> internal static bool CanEncodeString(int codePage, string stringToEncode) { // We have a System.String that contains some characters. Get a lossless representation // in byte-array form. var unicodeEncoding = new UnicodeEncoding(); var unicodeBytes = unicodeEncoding.GetBytes(stringToEncode); // Create an Encoding using the desired code page, but throws if there's a // character that can't be represented. var systemEncoding = Encoding.GetEncoding(codePage, EncoderFallback.ExceptionFallback, DecoderFallback.ExceptionFallback); try { var oemBytes = Encoding.Convert(unicodeEncoding, systemEncoding, unicodeBytes); // If Convert didn't throw, we can represent everything in the desired encoding. return true; } catch (EncoderFallbackException) { // If a fallback encoding was attempted, we need to go to Unicode. return false; } >>>>>>> if (Environment.OSVersion.Version < windows7) { useUtf8 = UseUtf8Never; } switch (useUtf8.ToUpperInvariant()) { case UseUtf8Always: return s_utf8WithoutBom; case UseUtf8Never: return EncodingUtilities.CurrentSystemOemEncoding; default: return CanEncodeString(defaultEncoding.CodePage, Command + WorkingDirectory) ? defaultEncoding : s_utf8WithoutBom; } #else return s_utf8WithoutBom; #endif } /// <summary> /// Checks to see if a string can be encoded in a specified code page. /// </summary> /// <remarks>Internal for testing purposes.</remarks> /// <param name="codePage">Code page for encoding.</param> /// <param name="stringToEncode">String to encode.</param> /// <returns>True if the string can be encoded in the specified code page.</returns> internal static bool CanEncodeString(int codePage, string stringToEncode) { // We have a System.String that contains some characters. Get a lossless representation // in byte-array form. var unicodeEncoding = new UnicodeEncoding(); var unicodeBytes = unicodeEncoding.GetBytes(stringToEncode); // Create an Encoding using the desired code page, but throws if there's a // character that can't be represented. var systemEncoding = Encoding.GetEncoding(codePage, EncoderFallback.ExceptionFallback, DecoderFallback.ExceptionFallback); try { var oemBytes = Encoding.Convert(unicodeEncoding, systemEncoding, unicodeBytes); // If Convert didn't throw, we can represent everything in the desired encoding. return true; } catch (EncoderFallbackException) { // If a fallback encoding was attempted, we need to go to Unicode. return false; }

<<<<<<< ======= using System.Diagnostics; using System.Text; >>>>>>> using System.Diagnostics; using System.Text; <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< string cmdPath = NativeMethodsShared.FindOnPath(shellName); Assert.IsNotNull(cmdPath); ======= Assert.NotNull(cmdPath); >>>>>>> string cmdPath = NativeMethodsShared.FindOnPath(shellName); Assert.NotNull(cmdPath); <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore("TEST: INSTALLED BUILD PROCESS")] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test] <<<<<<< [Test] [Ignore] // Ignore: Test requires installed toolset. ======= [TestMethod] >>>>>>> [Test]

<<<<<<< using NUnit.Framework; ======= >>>>>>> <<<<<<< [TestFixture] ======= >>>>>>> <<<<<<< [Test] ======= [Fact] >>>>>>> [Fact] <<<<<<< [ExpectedException(typeof(InternalErrorException))] [Test] ======= [Fact] >>>>>>> [Fact]

<<<<<<< using System.IO; using System.Threading; ======= using System.Diagnostics; >>>>>>> using System.Diagnostics; using System.IO; using System.Threading; <<<<<<< ======= using System.Threading; using Microsoft.Win32.SafeHandles; >>>>>>> using Microsoft.Win32.SafeHandles; <<<<<<< using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; ======= using Xunit.Abstractions; using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME; >>>>>>> using Xunit.Abstractions; using Microsoft.Build.Execution; using Microsoft.Build.Framework; using Microsoft.Build.Shared; using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;

<<<<<<< using System.Threading; using Glass.Mapper.Sc.Configuration.Attributes; ======= using Glass.Mapper.Sc.Configuration; >>>>>>> using Glass.Mapper.Sc.Configuration; using Glass.Mapper.Sc.Configuration.Attributes; <<<<<<< ======= private static readonly object _setupLock = new object(); private bool _setupComplete; private bool _setupProcessing; >>>>>>> private static readonly object _setupLock = new object(); private bool _setupComplete; private bool _setupProcessing; <<<<<<< ======= if (!_setupComplete) return base.GetItemDefinition(itemId, context); >>>>>>> if (!_setupComplete) return base.GetItemDefinition(itemId, context); <<<<<<< return null; ======= return base.GetItemDefinition(itemId, context); >>>>>>> return base.GetItemDefinition(itemId, context); <<<<<<< FieldList fields = new FieldList(); ======= if (!_setupComplete) return base.GetItemFields(itemDefinition, versionUri, context); var fields = new FieldList(); >>>>>>> if (!_setupComplete) return base.GetItemFields(itemDefinition, versionUri, context); var fields = new FieldList();

<<<<<<< private static ConcurrentDictionary<string, object> _compileCache = new ConcurrentDictionary<string, object>(); public const string Parameters = "Parameters"; protected Func<T, string> GetCompiled<T>(Expression<Func<T, string>> expression) { var key = typeof(T).FullName + expression.Body.ToString(); if (_compileCache.ContainsKey(key)) { return (Func<T, string>)_compileCache[key]; } var compiled = expression.Compile(); _compileCache.TryAdd(key, compiled); return compiled; } protected Func<T, object> GetCompiled<T>(Expression<Func<T, object>> expression) { var key = typeof (T).FullName + expression.Body.ToString(); if (_compileCache.ContainsKey(key)) { return (Func<T, object>) _compileCache[key]; } var compiled = expression.Compile(); _compileCache.TryAdd(key, compiled); return compiled; } ======= public const string Parameters = "Parameters"; >>>>>>> private static ConcurrentDictionary<string, object> _compileCache = new ConcurrentDictionary<string, object>(); public const string Parameters = "Parameters"; protected Func<T, string> GetCompiled<T>(Expression<Func<T, string>> expression) { var key = typeof(T).FullName + expression.Body.ToString(); if (_compileCache.ContainsKey(key)) { return (Func<T, string>)_compileCache[key]; } var compiled = expression.Compile(); _compileCache.TryAdd(key, compiled); return compiled; } protected Func<T, object> GetCompiled<T>(Expression<Func<T, object>> expression) { var key = typeof (T).FullName + expression.Body.ToString(); if (_compileCache.ContainsKey(key)) { return (Func<T, object>) _compileCache[key]; } var compiled = expression.Compile(); _compileCache.TryAdd(key, compiled); return compiled; } <<<<<<< var attrs = Utilities.GetPropertiesCollection(parameters, true); if (IsInEditingMode && isEditable) { var url = new UrlString(); url.Parameters.Add(attrs); return Editable(model, field, url.Query); } else { return RenderImage(GetCompiled(field).Invoke(model) as Fields.Image, parameters == null ? null : attrs); } ======= return RenderImage(field.Compile().Invoke(model) as Fields.Image, parameters == null ? null : attrs); >>>>>>> return RenderImage(GetCompiled(field).Invoke(model) as Fields.Image, parameters == null ? null : attrs); <<<<<<< firstPart = RenderImage(image, WebUtil.ParseUrlParameters(parametersString)); ======= firstPart = RenderImage(image, dictionary); >>>>>>> firstPart = RenderImage(image, dictionary); <<<<<<< var result = BeginRenderLink(link, WebUtil.ParseUrlParameters(parametersString), null, linkWriter); ======= var result = BeginRenderLink(link, dictionary,null, linkWriter); >>>>>>> var result = BeginRenderLink(link, dictionary,null, linkWriter);

<<<<<<< if (!string.IsNullOrEmpty(contents)) attrs["haschildren"] = "true"; ======= if (contents.IsNotNullOrEmpty()) { attrs.Add("haschildren", "true"); } >>>>>>> if (!string.IsNullOrEmpty(contents)) attrs["haschildren"] = "true"; if (contents.IsNotNullOrEmpty()) { attrs.Add("haschildren", "true"); } <<<<<<< model, Utilities.ConstructQueryString(attrs), ======= model, attrs, >>>>>>> model, Utilities.ConstructQueryString(attrs),

<<<<<<< inkCanvas1.InkPresenter.InputDeviceTypes = CoreInputDeviceTypes.Pen | CoreInputDeviceTypes.Mouse | CoreInputDeviceTypes.Touch; var stackPanel = new windows.UI.Xaml.Controls.StackPanel() ======= inkCanvas1.InkPresenter.InputDeviceTypes = CoreInputDeviceTypes.Pen | CoreInputDeviceTypes.Mouse | CoreInputDeviceTypes.Touch; Windows.UI.Xaml.Controls.StackPanel stackPanel = new Windows.UI.Xaml.Controls.StackPanel() >>>>>>> inkCanvas1.InkPresenter.InputDeviceTypes = CoreInputDeviceTypes.Pen | CoreInputDeviceTypes.Mouse | CoreInputDeviceTypes.Touch; windows.UI.Xaml.Controls.StackPanel stackPanel = new windows.UI.Xaml.Controls.StackPanel() <<<<<<< stackPanel.Children.Add(new windows.UI.Xaml.Controls.Button() ======= var button = new Windows.UI.Xaml.Controls.Button() >>>>>>> var button = new windows.UI.Xaml.Controls.Button <<<<<<< HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, Content = "This is a UWP Button", }); ======= HorizontalAlignment = Windows.UI.Xaml.HorizontalAlignment.Center, Content = "ContentDialog UWP Button", }; button.Tapped += Button_Tapped; stackPanel.Children.Add(button); >>>>>>> HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, Content = "ContentDialog UWP Button", }; button.Tapped += Button_Tapped; stackPanel.Children.Add(button); <<<<<<< stackPanel.Children.Add(new windows.UI.Xaml.Controls.Button() ======= Windows.UI.Xaml.Controls.Flyout flyout = new Windows.UI.Xaml.Controls.Flyout(); flyout.Content = new Windows.UI.Xaml.Controls.TextBlock() { Text = "Flyout content", }; var button2 = new Windows.UI.Xaml.Controls.Button() >>>>>>> windows.UI.Xaml.Controls.Flyout flyout = new windows.UI.Xaml.Controls.Flyout(); flyout.Content = new windows.UI.Xaml.Controls.TextBlock() { Text = "Flyout content", }; var button2 = new windows.UI.Xaml.Controls.Button() <<<<<<< HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, Content = "Another long UWP Button", }); ======= HorizontalAlignment = Windows.UI.Xaml.HorizontalAlignment.Center, Content = "Long UWP Button with Flyout", Flyout = flyout, }; stackPanel.Children.Add(button2); var comboBox = new Windows.UI.Xaml.Controls.ComboBox() { HorizontalAlignment = Windows.UI.Xaml.HorizontalAlignment.Center, }; comboBox.Items.Add("One"); comboBox.Items.Add("Two"); comboBox.Items.Add("Three"); comboBox.Items.Add("Four"); stackPanel.Children.Add(comboBox); Windows.UI.Xaml.Controls.Grid grid = new Windows.UI.Xaml.Controls.Grid(); stackPanel.Children.Add(grid); _contentDialog = new Windows.UI.Xaml.Controls.ContentDialog(); _contentDialog.Content = new Windows.UI.Xaml.Controls.TextBlock() { Text = "ContentDialog content", }; stackPanel.Children.Add(_contentDialog); var popup = new Windows.UI.Xaml.Controls.Primitives.Popup() { Width = 50, Height = 50, ShouldConstrainToRootBounds = false, Child = new Windows.UI.Xaml.Controls.TextBlock() { Text = "Popup child", }, }; grid.Children.Add(popup); >>>>>>> HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, Content = "Long UWP Button with Flyout", Flyout = flyout, }; stackPanel.Children.Add(button2); var comboBox = new windows.UI.Xaml.Controls.ComboBox() { HorizontalAlignment = windows.UI.Xaml.HorizontalAlignment.Center, }; comboBox.Items.Add("One"); comboBox.Items.Add("Two"); comboBox.Items.Add("Three"); comboBox.Items.Add("Four"); stackPanel.Children.Add(comboBox); windows.UI.Xaml.Controls.Grid grid = new windows.UI.Xaml.Controls.Grid(); stackPanel.Children.Add(grid); _contentDialog = new windows.UI.Xaml.Controls.ContentDialog(); _contentDialog.Content = new windows.UI.Xaml.Controls.TextBlock() { Text = "ContentDialog content", }; stackPanel.Children.Add(_contentDialog); var popup = new windows.UI.Xaml.Controls.Primitives.Popup() { Width = 50, Height = 50, ShouldConstrainToRootBounds = false, Child = new windows.UI.Xaml.Controls.TextBlock() { Text = "Popup child", }, }; grid.Children.Add(popup);

<<<<<<< /// <summary> /// Rights for this ACE. /// </summary> public enum UrlReservationRights { /// <summary> /// The 'register' rights value of the child UrlAce element /// </summary> register, /// <summary> /// The 'delete' rights value of the child UrlAce element /// </summary> @delegate, /// <summary> /// The 'all' rights value of the child UrlAce element /// </summary> all, } /// <summary> /// Specifies the behavior when trying to install a URL reservation and it already exists. /// </summary> public enum UrlReservationHandleExisting { /// <summary> /// Replaces the existing URL reservation (the default). /// </summary> replace, /// <summary> /// Keeps the existing URL reservation. /// </summary> ignore, /// <summary> /// The installation fails. /// </summary> fail, } /// <summary> /// Flags for indicating when the service should be configured. /// </summary> [Flags] public enum ConfigureServiceTrigger { #pragma warning disable 1591 /// <summary> /// Not a valid value for ServiceConfig.On(Install, Reinstall, Uninstall) /// </summary> None = 0, Install = 1, Reinstall = 2, Uninstall = 4 #pragma warning restore 1591 } /// <summary> /// Possible values for ServiceInstall.(First|Second|Third)FailureActionType /// </summary> public enum FailureActionType { #pragma warning disable 1591 none, reboot, restart, runCommand #pragma warning restore 1591 } ======= /// <summary> /// CA assembly validation mode /// </summary> public enum CAValidation { /// <summary> /// The CA assembly is loaded in the temporary remote AppDomain for validation. /// Assembly file is unlocked and at the end of the validation the assembly is unloaded. /// </summary> InRemoteAppDomain, /// <summary> /// The CA assembly is loaded in the current AppDomain for validation. /// Assembly file is unlocked but the assembly will not be unloaded at the end of the validation. /// This mode may lead to unpredictable behaviour. /// </summary> InCurrentAppDomain, /// <summary> /// CA assembly validation is disabled. /// </summary> Disabled } >>>>>>> /// <summary> /// Rights for this ACE. /// </summary> public enum UrlReservationRights { /// <summary> /// The 'register' rights value of the child UrlAce element /// </summary> register, /// <summary> /// The 'delete' rights value of the child UrlAce element /// </summary> @delegate, /// <summary> /// The 'all' rights value of the child UrlAce element /// </summary> all, } /// <summary> /// Specifies the behavior when trying to install a URL reservation and it already exists. /// </summary> public enum UrlReservationHandleExisting { /// <summary> /// Replaces the existing URL reservation (the default). /// </summary> replace, /// <summary> /// Keeps the existing URL reservation. /// </summary> ignore, /// <summary> /// The installation fails. /// </summary> fail, } /// <summary> /// Flags for indicating when the service should be configured. /// </summary> [Flags] public enum ConfigureServiceTrigger { #pragma warning disable 1591 /// <summary> /// Not a valid value for ServiceConfig.On(Install, Reinstall, Uninstall) /// </summary> None = 0, Install = 1, Reinstall = 2, Uninstall = 4 #pragma warning restore 1591 } /// <summary> /// Possible values for ServiceInstall.(First|Second|Third)FailureActionType /// </summary> public enum FailureActionType { #pragma warning disable 1591 none, reboot, restart, runCommand #pragma warning restore 1591 /// CA assembly validation mode /// </summary> public enum CAValidation { /// <summary> /// The CA assembly is loaded in the temporary remote AppDomain for validation. /// Assembly file is unlocked and at the end of the validation the assembly is unloaded. /// </summary> InRemoteAppDomain, /// <summary> /// The CA assembly is loaded in the current AppDomain for validation. /// Assembly file is unlocked but the assembly will not be unloaded at the end of the validation. /// This mode may lead to unpredictable behaviour. /// </summary> InCurrentAppDomain, /// <summary> /// CA assembly validation is disabled. /// </summary> Disabled }

<<<<<<< ProcessUrlReservations(project, featureComponents, defaultFeatureComponents, product); ======= ProcessIniFiles(project, featureComponents, defaultFeatureComponents, product); >>>>>>> ProcessUrlReservations(project, featureComponents, defaultFeatureComponents, product); ProcessIniFiles(project, featureComponents, defaultFeatureComponents, product); <<<<<<< static void ProcessUrlReservations(Project project, Dictionary<Feature, List<string>> featureComponents, List<string> defaultFeatureComponents, XElement product) { if (!project.UrlReservations.Any()) return; project.IncludeWixExtension(WixExtension.Http); int componentCount = 0; foreach (UrlReservation item in project.UrlReservations) { componentCount++; var compId = "UrlReservation" + componentCount; if (item.ActualFeatures.Any()) featureComponents.Map(item.ActualFeatures, compId); else defaultFeatureComponents.Add(compId); var topLevelDir = GetTopLevelDir(product); var comp = topLevelDir.AddElement( new XElement("Component", new XAttribute("Id", compId), new XAttribute("Guid", WixGuid.NewGuid(compId)))); comp.Add(item.ToXml()); } } ======= static void ProcessIniFiles(Project project, Dictionary<Feature, List<string>> featureComponents, List<string> defaultFeatureComponents, XElement product) { if (!project.IniFiles.Any()) return; int componentCount = 0; foreach (IniFile item in project.IniFiles) { componentCount++; var compId = "IniFile" + componentCount; if (item.ActualFeatures.Any()) featureComponents.Map(item.ActualFeatures, compId); else defaultFeatureComponents.Add(compId); var topLevelDir = GetTopLevelDir(product); var comp = topLevelDir.AddElement( new XElement("Component", new XAttribute("Id", compId), new XAttribute("Guid", WixGuid.NewGuid(compId)))); comp.Add(item.ToXml()); } } >>>>>>> static void ProcessUrlReservations(Project project, Dictionary<Feature, List<string>> featureComponents, List<string> defaultFeatureComponents, XElement product) { if (!project.UrlReservations.Any()) return; project.IncludeWixExtension(WixExtension.Http); int componentCount = 0; foreach (UrlReservation item in project.UrlReservations) { componentCount++; var compId = "UrlReservation" + componentCount; if (item.ActualFeatures.Any()) featureComponents.Map(item.ActualFeatures, compId); else defaultFeatureComponents.Add(compId); var topLevelDir = GetTopLevelDir(product); var comp = topLevelDir.AddElement( new XElement("Component", new XAttribute("Id", compId), new XAttribute("Guid", WixGuid.NewGuid(compId)))); comp.Add(item.ToXml()); } } static void ProcessIniFiles(Project project, Dictionary<Feature, List<string>> featureComponents, List<string> defaultFeatureComponents, XElement product) { if (!project.IniFiles.Any()) return; int componentCount = 0; foreach (IniFile item in project.IniFiles) { componentCount++; var compId = "IniFile" + componentCount; if (item.ActualFeatures.Any()) featureComponents.Map(item.ActualFeatures, compId); else defaultFeatureComponents.Add(compId); var topLevelDir = GetTopLevelDir(product); var comp = topLevelDir.AddElement( new XElement("Component", new XAttribute("Id", compId), new XAttribute("Guid", WixGuid.NewGuid(compId)))); comp.Add(item.ToXml()); } }

<<<<<<< ======= Client.Version = DDragonVersion; >>>>>>>

<<<<<<< ======= using System.IO; using Windows.Foundation; >>>>>>> <<<<<<< public IBuffer PixelBuffer { get; private set; } ======= private InMemoryBuffer _buffer; public IBuffer PixelBuffer => _buffer; >>>>>>> public IBuffer PixelBuffer { get; } <<<<<<< PixelBuffer = new UwpBuffer((uint)(pixelWidth * pixelHeight * 4)); ======= _buffer = new InMemoryBuffer(pixelWidth * pixelHeight * 4); >>>>>>> PixelBuffer = new UwpBuffer((uint)(pixelWidth * pixelHeight * 4));

<<<<<<< using Windows.System.Profile; using Uno.UI.Runtime.Skia.Tizen.System.Profile; ======= using Windows.ApplicationModel; using Uno.UI.Runtime.Skia.Tizen.ApplicationModel; using Uno.ApplicationModel; >>>>>>> using Windows.System.Profile; using Uno.UI.Runtime.Skia.Tizen.System.Profile; using Windows.ApplicationModel; using Uno.UI.Runtime.Skia.Tizen.ApplicationModel; using Uno.ApplicationModel; <<<<<<< ApiExtensibility.Register(typeof(IAnalyticsInfoExtension), o => new TizenAnalyticsInfoExtension(o)); ======= ApiExtensibility.Register(typeof(IPackageIdExtension), o => new TizenPackageIdExtension(o)); >>>>>>> ApiExtensibility.Register(typeof(IAnalyticsInfoExtension), o => new TizenAnalyticsInfoExtension(o)); ApiExtensibility.Register(typeof(IPackageIdExtension), o => new TizenPackageIdExtension(o));

<<<<<<< this.source.Add (new ListViewExamples ()); ======= this.source.Add (new SideDrawerExamples ()); >>>>>>> this.source.Add (new ListViewExamples ()); this.source.Add (new SideDrawerExamples ());