Move lots of shared code to Microsoft.Build.Framework

src/Build.OM.UnitTests/Construction/ProjectFormatting_Tests.cs

@@ -8,6 +8,7 @@
 using System.Text;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Shared;
 using Microsoft.Build.UnitTests;
 using Xunit;

src/Build.OM.UnitTests/Construction/ProjectImportElement_Tests.cs

@@ -7,6 +7,7 @@
 using System.Xml;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Shared;
 using Xunit;
 using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException;
@@ -159,12 +160,12 @@ public void SettingProjectDirties()
 
             try
             {
-                file1 = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                file1 = FileUtilities.GetTemporaryFileName();
                 ProjectRootElement importProject1 = ProjectRootElement.Create();
                 importProject1.AddProperty("p", "v1");
                 importProject1.Save(file1);
 
-                file2 = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                file2 = FileUtilities.GetTemporaryFileName();
                 ProjectRootElement importProject2 = ProjectRootElement.Create();
                 importProject2.AddProperty("p", "v2");
                 importProject2.Save(file2);
@@ -203,7 +204,7 @@ public void SettingConditionDirties()
 
             try
             {
-                file = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                file = FileUtilities.GetTemporaryFileName();
                 ProjectRootElement importProject = ProjectRootElement.Create();
                 importProject.AddProperty("p", "v1");
                 importProject.Save(file);

src/Build.OM.UnitTests/Construction/ProjectRootElement_Tests.cs

@@ -19,6 +19,7 @@
 using InvalidProjectFileException = Microsoft.Build.Exceptions.InvalidProjectFileException;
 using ProjectCollection = Microsoft.Build.Evaluation.ProjectCollection;
 using Xunit;
+using Microsoft.Build.Framework;
 
 #nullable disable
 
@@ -253,7 +254,7 @@ public void ConstructOverSameFileReturnsSameEvenWithOneBeingRelativePath4()
         public void SetFullPathProjectXmlAlreadyLoaded()
         {
             ProjectRootElement projectXml1 = ProjectRootElement.Create();
-            projectXml1.FullPath = Microsoft.Build.Shared.FileUtilities.GetTemporaryFile();
+            projectXml1.FullPath = FileUtilities.GetTemporaryFile();
 
             ProjectRootElement projectXml2 = ProjectRootElement.Create();
             projectXml2.FullPath = projectXml1.FullPath;
@@ -425,7 +426,7 @@ public void ValidXmlInvalidSyntaxOpenFromDiskTwice()
                 {
                     try
                     {
-                        path = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                        path = FileUtilities.GetTemporaryFileName();
                         File.WriteAllText(path, content);
 
                         ProjectRootElement.Open(path);
@@ -909,7 +910,7 @@ public void SolutionCanNotBeOpened()
 
                 try
                 {
-                    tempFileSentinel = Microsoft.Build.Shared.FileUtilities.GetTemporaryFile();
+                    tempFileSentinel = FileUtilities.GetTemporaryFile();
                     solutionFile = Path.ChangeExtension(tempFileSentinel, ".sln");
                     File.Copy(tempFileSentinel, solutionFile);
 
@@ -954,7 +955,7 @@ public void ProjectCanNotBeOpened()
                 try
                 {
                     // Does not have .sln or .vcproj extension so loads as project
-                    projectFile = Microsoft.Build.Shared.FileUtilities.GetTemporaryFile();
+                    projectFile = FileUtilities.GetTemporaryFile();
 
                     security = new FileSecurity(projectFile, System.Security.AccessControl.AccessControlSections.All);
                     security.AddAccessRule(rule);
@@ -990,7 +991,7 @@ public void SolutionCorrupt()
 
                 try
                 {
-                    solutionFile = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                    solutionFile = FileUtilities.GetTemporaryFileName();
 
                     // Arbitrary corrupt content
                     string content = @"Microsoft Visual Studio Solution File, Format Version 10.00

src/Build.OM.UnitTests/Construction/SolutionFile_Tests.cs

@@ -6,6 +6,7 @@
 using System.Threading;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Exceptions;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Shared;
 using Microsoft.VisualStudio.SolutionPersistence;
 using Microsoft.VisualStudio.SolutionPersistence.Model;

src/Build.OM.UnitTests/Construction/WhiteSpacePreservation_Tests.cs

@@ -7,6 +7,7 @@
 using System.Text.RegularExpressions;
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Shared;
 using Xunit;
 

src/Build.OM.UnitTests/Definition/ProjectCollection_Tests.cs

@@ -9,6 +9,7 @@
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Execution;
+using Microsoft.Build.Framework;
 using Microsoft.Build.Shared;
 using Microsoft.Build.Utilities;
 using Shouldly;

src/Build.OM.UnitTests/Definition/ProjectItemDefinition_Tests.cs

@@ -121,7 +121,7 @@ public void UpdateMetadataImported()
 
                 try
                 {
-                    file = Microsoft.Build.Shared.FileUtilities.GetTemporaryFile();
+                    file = FileUtilities.GetTemporaryFile();
                     ProjectRootElement import = ProjectRootElement.Create(file);
                     import.AddItemDefinitionGroup().AddItemDefinition("i").AddMetadata("m", "m0");
                     import.Save();
@@ -151,7 +151,7 @@ public void SetMetadataImported()
 
             try
             {
-                file = Microsoft.Build.Shared.FileUtilities.GetTemporaryFile();
+                file = FileUtilities.GetTemporaryFile();
                 ProjectRootElement import = ProjectRootElement.Create(file);
                 import.AddItemDefinitionGroup().AddItemDefinition("i").AddMetadata("m", "m0");
                 import.Save();

src/Build.OM.UnitTests/Definition/ProjectItem_Tests.cs

@@ -319,7 +319,7 @@ public void BuiltInMetadataTimes()
 
             try
             {
-                path = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                path = FileUtilities.GetTemporaryFileName();
                 File.WriteAllText(path, String.Empty);
                 FileInfo info = new FileInfo(path);
 
@@ -2053,7 +2053,7 @@ public void RenameImported()
 
                 try
                 {
-                    file = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                    file = FileUtilities.GetTemporaryFileName();
                     Project import = new Project();
                     import.AddItem("i", "i1");
                     import.Save(file);
@@ -2084,7 +2084,7 @@ public void SetMetadataImported()
 
                 try
                 {
-                    file = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                    file = FileUtilities.GetTemporaryFileName();
                     Project import = new Project();
                     import.AddItem("i", "i1");
                     import.Save(file);
@@ -2115,7 +2115,7 @@ public void RemoveMetadataImported()
 
                 try
                 {
-                    file = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                    file = FileUtilities.GetTemporaryFileName();
                     Project import = new Project();
                     ProjectItem item = import.AddItem("i", "i1")[0];
                     item.SetMetadataValue("m", "m0");
@@ -2478,7 +2478,7 @@ public void RemoveWithItemReferenceOnFilePathMatchingMetadata()
             var project = ObjectModelHelpers.CreateInMemoryProject(content);
             var items = project.ItemsIgnoringCondition.Where(i => i.ItemType.Equals("I2"));
 
-            if (FileUtilities.GetIsFileSystemCaseSensitive())
+            if (FileUtilities.IsFileSystemCaseSensitive)
             {
                 items.Select(i => i.EvaluatedInclude).ShouldBe(new[] { "a2", "b2", "c2", "g2" });
 

src/Build.OM.UnitTests/Definition/ProjectProperty_Tests.cs

@@ -7,6 +7,7 @@
 
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
+using Microsoft.Build.Framework;
 using Xunit;
 
 #nullable disable
@@ -260,7 +261,7 @@ public void SetPropertyImported()
 
                 try
                 {
-                    file = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                    file = FileUtilities.GetTemporaryFileName();
                     Project import = new Project();
                     import.SetProperty("p", "v0");
                     import.Save(file);

src/Build.OM.UnitTests/Definition/Project_Tests.cs

@@ -2089,7 +2089,7 @@ public void BuildEvaluationUsesCustomLoggers()
                 ObjectModelHelpers.CleanupFileContents(@"<Project xmlns='msbuildnamespace'>
                 </Project>");
 
-            string importFileName = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName() + ".proj";
+            string importFileName = FileUtilities.GetTemporaryFileName() + ".proj";
             File.WriteAllText(importFileName, importProjectContent);
 
             string projectContent =
@@ -3350,7 +3350,7 @@ public void GetItemProvenancePathMatchingShouldBeCaseInsensitive()
                 ("A", Operation.Include, Provenance.StringLiteral, 1)
             };
 
-            AssertProvenanceResult(expected, project, FileUtilities.GetIsFileSystemCaseSensitive() ? "a" : "A");
+            AssertProvenanceResult(expected, project, FileUtilities.IsFileSystemCaseSensitive ? "a" : "A");
         }
 
 

src/Build.OM.UnitTests/Definition/ProtectImports_Tests.cs

@@ -7,6 +7,7 @@
 using System.Linq;
 
 using Microsoft.Build.Evaluation;
+using Microsoft.Build.Framework;
 using Xunit;
 
 #nullable disable
@@ -103,7 +104,7 @@ public ProtectImports_Tests()
                 </Project>";
 
             importContents = Expand(importContents);
-            _importFilename = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName() + ".targets";
+            _importFilename = FileUtilities.GetTemporaryFileName() + ".targets";
             File.WriteAllText(_importFilename, importContents);
         }
 

src/Build.OM.UnitTests/Instance/ProjectTargetInstance_Tests.cs

@@ -6,6 +6,7 @@
 using Microsoft.Build.Construction;
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Execution;
+using Microsoft.Build.Framework;
 using Xunit;
 
 #nullable disable
@@ -111,7 +112,7 @@ public void FileLocationAvailableEvenAfterEdits()
 
             try
             {
-                path = Microsoft.Build.Shared.FileUtilities.GetTemporaryFileName();
+                path = FileUtilities.GetTemporaryFileName();
                 ProjectRootElement projectXml = ProjectRootElement.Create(path);
                 projectXml.Save();
 

src/Build.OM.UnitTests/Microsoft.Build.Engine.OM.UnitTests.csproj

@@ -1,6 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\Shared\FileSystemSources.proj" />
   <Import Project="..\Shared\DebuggingSources.proj" />
 
   <PropertyGroup>
@@ -46,11 +45,6 @@
     <Compile Include="..\Shared\BuildEnvironmentHelper.cs">
       <Link>BuildEnvironmentHelper.cs</Link>
     </Compile>
-    <Compile Include="..\Shared\TempFileUtilities.cs" />
-    <Compile Include="..\Shared\FileUtilities.cs" />
-    <Compile Include="..\Shared\EscapingUtilities.cs" />
-    <Compile Include="..\Shared\FileUtilitiesRegex.cs" />
-    <Compile Include="..\Shared\ExceptionHandling.cs" />
     <None Include="..\Shared\UnitTests\App.config">
       <Link>App.config</Link>
       <SubType>Designer</SubType>

src/Build.OM.UnitTests/TransientIO.cs

@@ -8,6 +8,7 @@ namespace Microsoft.Build.UnitTests
     using System;
     using System.Collections.Generic;
     using System.IO;
+    using Microsoft.Build.Framework;
     using Microsoft.Build.Shared;
 
     public class TransientIO : IDisposable