Merged PR 709961: Refactor Instrumentation.Common dll

Refactoring Instrumentation.Common to only contain Aria specific files, and moving all the non-Aria code into Utilities.Core instead. The motivation behind this is so that BXL released packages won't contain Aria packages which is an external pacakge. We want to have as little external packages as possible because it might cause diamond dependencies. (eg. BXL.Utilities depends on Aria1.0 and ExPkg depends on Aria1.1 and the customer pulls both in, there will be a version conflict)

Author: minglunli

Private/CloudTest/Gvfs/BuildXL.CloudTest.Gvfs.dsc

@@ -36,7 +36,6 @@ export const dll = BuildXLSdk.test({
         importFrom("BuildXL.Utilities").Storage.dll,
         importFrom("BuildXL.Utilities").Utilities.Core.dll,
         importFrom("BuildXL.Utilities.UnitTests").TestUtilities.XUnit.dll,
-        importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
 
         ...importFrom("Sdk.Managed.Testing.XUnit").xunitReferences,
 

Private/Wdg/ExecutionLogSdk/Private.Wdg.ExecutionLogSdk.dsc

@@ -27,7 +27,6 @@ export const dll = BuildXLSdk.library({
         importFrom("BuildXL.Utilities").Native.dll,
         importFrom("BuildXL.Utilities").Storage.dll,
         importFrom("BuildXL.Utilities").Utilities.Core.dll,
-        importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
 
         ...BuildXLSdk.systemMemoryDeployment,
     ],

Public/Sdk/SelfHost/BuildXL/BuildXLSdk.dsc

@@ -793,7 +793,6 @@ function processArguments(args: Arguments, targetType: Csc.TargetType) : Argumen
             ] : [
                 importFrom("BuildXL.Utilities").Utilities.Core.dll.compile,
                 importFrom("BuildXL.Utilities.Instrumentation").Tracing.dll.compile,
-                importFrom("BuildXL.Utilities.Instrumentation").Common.dll.compile,
                 ...Managed.Helpers.computeCompileClosure(framework, framework.standardReferences),
             ];
 

Public/Src/App/Bxl/Bxl.dsc

@@ -61,7 +61,7 @@ namespace Main {
             importFrom("BuildXL.Utilities").ToolSupport.dll,
             importFrom("BuildXL.Utilities").Script.Constants.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
-            importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
+            importFrom("BuildXL.Utilities.Instrumentation").AriaCommon.dll,
             importFrom("BuildXL.FrontEnd").Factory.dll,
             importFrom("BuildXL.FrontEnd").Sdk.dll,
             importFrom("Newtonsoft.Json").pkg,

Public/Src/App/ConsoleLogger/BuildXL.ConsoleLogger.dsc

@@ -19,7 +19,6 @@ namespace ConsoleLogger {
             importFrom("BuildXL.Pips").dll,
             importFrom("BuildXL.Utilities").dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
-            importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
         ],
         internalsVisibleTo: [
             "Test.Bxl",

Public/Src/App/UnitTests/Bxl/Test.Bxl.dsc

@@ -19,7 +19,6 @@ namespace UnitTests.Bxl {
             importFrom("BuildXL.Utilities").ToolSupport.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
             importFrom("BuildXL.Utilities.UnitTests").Core.dll,
-            importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
             importFrom("BuildXL.Utilities.Instrumentation").Tracing.dll,
             importFrom("BuildXL.Engine").Engine.dll,
             importFrom("BuildXL.Engine").Scheduler.dll,

Public/Src/Cache/ContentStore/InterfacesTest/BuildXL.Cache.ContentStore.Interfaces.Test.dsc

@@ -22,7 +22,6 @@ namespace InterfacesTest {
             importFrom("BuildXL.Utilities").Collections.dll,
             importFrom("BuildXL.Utilities").Native.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
-            importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
 
             ...BuildXLSdk.systemMemoryDeployment,
             importFrom("Newtonsoft.Json").pkg,

Public/Src/Cache/VerticalStore/BasicFilesystem/BuildXL.Cache.BasicFilesystem.dsc

@@ -19,7 +19,6 @@ namespace BasicFilesystem {
             importFrom("BuildXL.Utilities").Collections.dll,
             importFrom("BuildXL.Utilities").Configuration.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
-            importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
             importFrom("Newtonsoft.Json").pkg,
             ...BuildXLSdk.bclAsyncPackages,
         ],

Public/Src/Cache/VerticalStore/Interfaces/BuildXL.Cache.Interfaces.dsc

@@ -21,7 +21,6 @@ namespace Interfaces {
             importFrom("BuildXL.Utilities").Collections.dll,
             importFrom("BuildXL.Utilities").Configuration.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
-            importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
             importFrom("Newtonsoft.Json").pkg,
         ],
     });

Public/Src/Cache/VerticalStore/MemoizationStoreAdapter/BuildXL.Cache.MemoizationStoreAdapter.dsc

@@ -16,7 +16,6 @@ namespace MemoizationStoreAdapter {
             importFrom("BuildXL.Utilities").Native.dll,
             importFrom("BuildXL.Utilities").Storage.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
-            importFrom("BuildXL.Utilities.Instrumentation").Common.dll,
             importFrom("BuildXL.Utilities.Instrumentation").Tracing.dll,
             ...BuildXLSdk.bclAsyncPackages,
             importFrom("BuildXL.Cache.ContentStore").UtilitiesCore.dll,