diff --git a/Private/Wdg/ExecutionLogSdk/Private.Wdg.ExecutionLogSdk.dsc b/Private/Wdg/ExecutionLogSdk/Private.Wdg.ExecutionLogSdk.dsc
index 640fc3926..725db4366 100644
--- a/Private/Wdg/ExecutionLogSdk/Private.Wdg.ExecutionLogSdk.dsc
+++ b/Private/Wdg/ExecutionLogSdk/Private.Wdg.ExecutionLogSdk.dsc
@@ -23,7 +23,6 @@ export const dll = BuildXLSdk.library({
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Engine").Scheduler.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/App/Bxl/Bxl.dsc b/Public/Src/App/Bxl/Bxl.dsc
index ac9b0e6f2..6ff06b6e5 100644
--- a/Public/Src/App/Bxl/Bxl.dsc
+++ b/Public/Src/App/Bxl/Bxl.dsc
@@ -52,7 +52,6 @@ namespace Main {
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Branding.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").Native.dll,
diff --git a/Public/Src/Cache/ContentStore/App/BuildXL.Cache.ContentStore.App.dsc b/Public/Src/Cache/ContentStore/App/BuildXL.Cache.ContentStore.App.dsc
index fe21a1527..eeaf149dd 100644
--- a/Public/Src/Cache/ContentStore/App/BuildXL.Cache.ContentStore.App.dsc
+++ b/Public/Src/Cache/ContentStore/App/BuildXL.Cache.ContentStore.App.dsc
@@ -36,9 +36,8 @@ namespace App {
importFrom("BuildXL.Cache.DistributedCache.Host").Service.dll,
importFrom("BuildXL.Cache.DistributedCache.Host").Configuration.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
-
+
importFrom("Microsoft.IdentityModel.Clients.ActiveDirectory").pkg,
importFrom("Newtonsoft.Json").pkg,
diff --git a/Public/Src/Cache/ContentStore/Distributed/BuildXL.Cache.ContentStore.Distributed.dsc b/Public/Src/Cache/ContentStore/Distributed/BuildXL.Cache.ContentStore.Distributed.dsc
index 37a870e0a..ac555738d 100644
--- a/Public/Src/Cache/ContentStore/Distributed/BuildXL.Cache.ContentStore.Distributed.dsc
+++ b/Public/Src/Cache/ContentStore/Distributed/BuildXL.Cache.ContentStore.Distributed.dsc
@@ -54,7 +54,6 @@ namespace Distributed {
importFrom("BuildXL.Utilities").Branding.dll,
importFrom("BuildXL.Utilities").KeyValueStore.dll,
importFrom("BuildXL.Utilities").Native.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
...importFrom("Sdk.Selfhost.RocksDbSharp").pkgs,
Grpc.dll,
diff --git a/Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc b/Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc
index b9f3b2934..0db744097 100644
--- a/Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc
+++ b/Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc
@@ -81,7 +81,6 @@ namespace DistributedTest {
importFrom("BuildXL.Cache.DistributedCache.Host").Service.dll,
importFrom("BuildXL.Cache.DistributedCache.Host").Configuration.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").KeyValueStore.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Cache/ContentStore/InterfacesTest/BuildXL.Cache.ContentStore.Interfaces.Test.dsc b/Public/Src/Cache/ContentStore/InterfacesTest/BuildXL.Cache.ContentStore.Interfaces.Test.dsc
index b8e4e23bf..4bb1639a9 100644
--- a/Public/Src/Cache/ContentStore/InterfacesTest/BuildXL.Cache.ContentStore.Interfaces.Test.dsc
+++ b/Public/Src/Cache/ContentStore/InterfacesTest/BuildXL.Cache.ContentStore.Interfaces.Test.dsc
@@ -19,7 +19,6 @@ namespace InterfacesTest {
importFrom("BuildXL.Cache.DistributedCache.Host").Configuration.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Cache/ContentStore/Library/BuildXL.Cache.ContentStore.Library.dsc b/Public/Src/Cache/ContentStore/Library/BuildXL.Cache.ContentStore.Library.dsc
index f6f7287e6..a4c79a076 100644
--- a/Public/Src/Cache/ContentStore/Library/BuildXL.Cache.ContentStore.Library.dsc
+++ b/Public/Src/Cache/ContentStore/Library/BuildXL.Cache.ContentStore.Library.dsc
@@ -40,7 +40,6 @@ namespace Library {
...importFrom("Sdk.Selfhost.RocksDbSharp").pkgs,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Cache.DistributedCache.Host").Configuration.dll,
...getGrpcPackages(true),
...getGrpcDotNetPackages(),
diff --git a/Public/Src/Cache/ContentStore/Test/BuildXL.Cache.ContentStore.Test.dsc b/Public/Src/Cache/ContentStore/Test/BuildXL.Cache.ContentStore.Test.dsc
index adf187324..2fde75851 100644
--- a/Public/Src/Cache/ContentStore/Test/BuildXL.Cache.ContentStore.Test.dsc
+++ b/Public/Src/Cache/ContentStore/Test/BuildXL.Cache.ContentStore.Test.dsc
@@ -25,7 +25,6 @@ namespace Test {
),
// TODO: This needs to be renamed to just utilities... but it is in a package in public/src
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").KeyValueStore.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Cache/ContentStore/Vsts/BuildXL.Cache.ContentStore.Vsts.dsc b/Public/Src/Cache/ContentStore/Vsts/BuildXL.Cache.ContentStore.Vsts.dsc
index 7ccf425e3..81f31faef 100644
--- a/Public/Src/Cache/ContentStore/Vsts/BuildXL.Cache.ContentStore.Vsts.dsc
+++ b/Public/Src/Cache/ContentStore/Vsts/BuildXL.Cache.ContentStore.Vsts.dsc
@@ -18,7 +18,6 @@ namespace Vsts {
UtilitiesCore.dll,
...BuildXLSdk.visualStudioServicesArtifactServicesWorkaround,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Authentication.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc b/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc
index 10ed0ab4d..6a9f63442 100644
--- a/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc
+++ b/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc
@@ -24,7 +24,6 @@ namespace LauncherServer {
importFrom("BuildXL.Cache.ContentStore").Interfaces.dll,
importFrom("BuildXL.Cache.ContentStore").Distributed.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("Azure.Security.KeyVault.Secrets").pkg,
diff --git a/Public/Src/Cache/DistributedCache.Host/Service/BuildXL.Cache.Host.Service.dsc b/Public/Src/Cache/DistributedCache.Host/Service/BuildXL.Cache.Host.Service.dsc
index 95f7d3f1b..dcd3d4191 100644
--- a/Public/Src/Cache/DistributedCache.Host/Service/BuildXL.Cache.Host.Service.dsc
+++ b/Public/Src/Cache/DistributedCache.Host/Service/BuildXL.Cache.Host.Service.dsc
@@ -28,7 +28,6 @@ namespace Service {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Branding.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Cache/DistributedCache.Host/Test/BuildXL.Cache.Host.Test.dsc b/Public/Src/Cache/DistributedCache.Host/Test/BuildXL.Cache.Host.Test.dsc
index 4cbdf33a4..1f7c6c270 100644
--- a/Public/Src/Cache/DistributedCache.Host/Test/BuildXL.Cache.Host.Test.dsc
+++ b/Public/Src/Cache/DistributedCache.Host/Test/BuildXL.Cache.Host.Test.dsc
@@ -35,7 +35,6 @@ namespace Test {
// Used by Launcher integration test
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Cache.ContentStore").App.exe,
...addIfLazy(!BuildXLSdk.isFullFramework, () => [LauncherServer.exe]
diff --git a/Public/Src/Cache/Logging/Library/BuildXL.Cache.Logging.Library.dsc b/Public/Src/Cache/Logging/Library/BuildXL.Cache.Logging.Library.dsc
index a4c6de9ab..88f5246d1 100644
--- a/Public/Src/Cache/Logging/Library/BuildXL.Cache.Logging.Library.dsc
+++ b/Public/Src/Cache/Logging/Library/BuildXL.Cache.Logging.Library.dsc
@@ -20,7 +20,6 @@ namespace Library {
importFrom("BuildXL.Cache.ContentStore").Library.dll,
importFrom("BuildXL.Cache.DistributedCache.Host").Configuration.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("System.Threading.Tasks.Extensions").pkg,
...BuildXLSdk.systemThreadingTasksDataflowPackageReference,
diff --git a/Public/Src/Cache/MemoizationStore/Distributed/BuildXL.Cache.MemoizationStore.Distributed.dsc b/Public/Src/Cache/MemoizationStore/Distributed/BuildXL.Cache.MemoizationStore.Distributed.dsc
index 50f0d336c..98c4707b7 100644
--- a/Public/Src/Cache/MemoizationStore/Distributed/BuildXL.Cache.MemoizationStore.Distributed.dsc
+++ b/Public/Src/Cache/MemoizationStore/Distributed/BuildXL.Cache.MemoizationStore.Distributed.dsc
@@ -20,7 +20,6 @@ namespace Distributed {
importFrom("BuildXL.Cache.DistributedCache.Host").Configuration.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
...BuildXLSdk.bclAsyncPackages,
...importFrom("BuildXL.Cache.ContentStore").getSerializationPackages(true),
diff --git a/Public/Src/Cache/MemoizationStore/DistributedTest/BuildXL.Cache.MemoizationStore.Distributed.Test.dsc b/Public/Src/Cache/MemoizationStore/DistributedTest/BuildXL.Cache.MemoizationStore.Distributed.Test.dsc
index 4fe588aa3..1139b2958 100644
--- a/Public/Src/Cache/MemoizationStore/DistributedTest/BuildXL.Cache.MemoizationStore.Distributed.Test.dsc
+++ b/Public/Src/Cache/MemoizationStore/DistributedTest/BuildXL.Cache.MemoizationStore.Distributed.Test.dsc
@@ -40,7 +40,6 @@ namespace DistributedTest {
importFrom("BuildXL.Cache.DistributedCache.Host").Configuration.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
...BuildXLSdk.fluentAssertionsWorkaround,
...BuildXLSdk.bclAsyncPackages,
diff --git a/Public/Src/Cache/MemoizationStore/Interfaces/BuildXL.Cache.MemoizationStore.Interfaces.dsc b/Public/Src/Cache/MemoizationStore/Interfaces/BuildXL.Cache.MemoizationStore.Interfaces.dsc
index bd167fa7e..99a4d2815 100644
--- a/Public/Src/Cache/MemoizationStore/Interfaces/BuildXL.Cache.MemoizationStore.Interfaces.dsc
+++ b/Public/Src/Cache/MemoizationStore/Interfaces/BuildXL.Cache.MemoizationStore.Interfaces.dsc
@@ -16,7 +16,6 @@ namespace Interfaces {
ContentStore.Interfaces.dll,
ContentStore.Library.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
...BuildXLSdk.bclAsyncPackages,
...BuildXLSdk.systemMemoryDeployment,
diff --git a/Public/Src/Cache/MemoizationStore/InterfacesTest/BuildXL.Cache.MemoizationStore.Interfaces.Test.dsc b/Public/Src/Cache/MemoizationStore/InterfacesTest/BuildXL.Cache.MemoizationStore.Interfaces.Test.dsc
index 89c270f10..7408a08ce 100644
--- a/Public/Src/Cache/MemoizationStore/InterfacesTest/BuildXL.Cache.MemoizationStore.Interfaces.Test.dsc
+++ b/Public/Src/Cache/MemoizationStore/InterfacesTest/BuildXL.Cache.MemoizationStore.Interfaces.Test.dsc
@@ -16,7 +16,6 @@ namespace InterfacesTest {
Interfaces.dll,
Library.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
...BuildXLSdk.bclAsyncPackages,
ContentStore.Test.dll,
diff --git a/Public/Src/Cache/MemoizationStore/Library/BuildXL.Cache.MemoizationStore.Library.dsc b/Public/Src/Cache/MemoizationStore/Library/BuildXL.Cache.MemoizationStore.Library.dsc
index c76f09343..b9965bbdb 100644
--- a/Public/Src/Cache/MemoizationStore/Library/BuildXL.Cache.MemoizationStore.Library.dsc
+++ b/Public/Src/Cache/MemoizationStore/Library/BuildXL.Cache.MemoizationStore.Library.dsc
@@ -23,7 +23,6 @@ namespace Library {
importFrom("BuildXL.Cache.DistributedCache.Host").Configuration.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
...BuildXLSdk.bclAsyncPackages,
diff --git a/Public/Src/Cache/MemoizationStore/Test/BuildXL.Cache.MemoizationStore.Test.dsc b/Public/Src/Cache/MemoizationStore/Test/BuildXL.Cache.MemoizationStore.Test.dsc
index bc691144b..e0f34cebd 100644
--- a/Public/Src/Cache/MemoizationStore/Test/BuildXL.Cache.MemoizationStore.Test.dsc
+++ b/Public/Src/Cache/MemoizationStore/Test/BuildXL.Cache.MemoizationStore.Test.dsc
@@ -34,7 +34,6 @@ namespace Test {
Library.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
...BuildXLSdk.bclAsyncPackages,
...BuildXLSdk.fluentAssertionsWorkaround,
diff --git a/Public/Src/Cache/MemoizationStore/Vsts/BuildXL.Cache.MemoizationStore.Vsts.dsc b/Public/Src/Cache/MemoizationStore/Vsts/BuildXL.Cache.MemoizationStore.Vsts.dsc
index 32a4703f1..d8993da88 100644
--- a/Public/Src/Cache/MemoizationStore/Vsts/BuildXL.Cache.MemoizationStore.Vsts.dsc
+++ b/Public/Src/Cache/MemoizationStore/Vsts/BuildXL.Cache.MemoizationStore.Vsts.dsc
@@ -29,7 +29,6 @@ namespace Vsts {
...BuildXLSdk.systemThreadingTasksDataflowPackageReference,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Authentication.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
],
allowUnsafeBlocks: true,
diff --git a/Public/Src/Cache/Monitor/Library/BuildXL.Cache.Monitor.Library.dsc b/Public/Src/Cache/Monitor/Library/BuildXL.Cache.Monitor.Library.dsc
index 479a57b85..2b6e194cb 100644
--- a/Public/Src/Cache/Monitor/Library/BuildXL.Cache.Monitor.Library.dsc
+++ b/Public/Src/Cache/Monitor/Library/BuildXL.Cache.Monitor.Library.dsc
@@ -14,7 +14,6 @@ namespace Library {
importFrom("System.Collections.Immutable").pkg,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Cache/VerticalStore/Analyzer/BuildXL.Cache.Analyzer.dsc b/Public/Src/Cache/VerticalStore/Analyzer/BuildXL.Cache.Analyzer.dsc
index 909b8b7ce..24b11740b 100644
--- a/Public/Src/Cache/VerticalStore/Analyzer/BuildXL.Cache.Analyzer.dsc
+++ b/Public/Src/Cache/VerticalStore/Analyzer/BuildXL.Cache.Analyzer.dsc
@@ -18,7 +18,6 @@ namespace Analyzer {
importFrom("BuildXL.Cache.ContentStore").UtilitiesCore.dll,
importFrom("BuildXL.Cache.ContentStore").Interfaces.dll,
importFrom("BuildXL.Cache.MemoizationStore").Interfaces.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Engine").Scheduler.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Configuration.dll,
diff --git a/Public/Src/Cache/VerticalStore/BasicFilesystem/BuildXL.Cache.BasicFilesystem.dsc b/Public/Src/Cache/VerticalStore/BasicFilesystem/BuildXL.Cache.BasicFilesystem.dsc
index f55e19e69..e695a4500 100644
--- a/Public/Src/Cache/VerticalStore/BasicFilesystem/BuildXL.Cache.BasicFilesystem.dsc
+++ b/Public/Src/Cache/VerticalStore/BasicFilesystem/BuildXL.Cache.BasicFilesystem.dsc
@@ -16,7 +16,6 @@ namespace BasicFilesystem {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("Newtonsoft.Json").pkg,
diff --git a/Public/Src/Cache/VerticalStore/Compositing/BuildXL.Cache.Compositing.dsc b/Public/Src/Cache/VerticalStore/Compositing/BuildXL.Cache.Compositing.dsc
index 8f446906f..8480574ce 100644
--- a/Public/Src/Cache/VerticalStore/Compositing/BuildXL.Cache.Compositing.dsc
+++ b/Public/Src/Cache/VerticalStore/Compositing/BuildXL.Cache.Compositing.dsc
@@ -13,7 +13,6 @@ namespace Compositing {
importFrom("BuildXL.Cache.ContentStore").Interfaces.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
],
diff --git a/Public/Src/Cache/VerticalStore/ImplementationSupport/BuildXL.Cache.ImplementationSupport.dsc b/Public/Src/Cache/VerticalStore/ImplementationSupport/BuildXL.Cache.ImplementationSupport.dsc
index 9dafa2a63..8fc61e554 100644
--- a/Public/Src/Cache/VerticalStore/ImplementationSupport/BuildXL.Cache.ImplementationSupport.dsc
+++ b/Public/Src/Cache/VerticalStore/ImplementationSupport/BuildXL.Cache.ImplementationSupport.dsc
@@ -12,7 +12,6 @@ namespace ImplementationSupport {
importFrom("BuildXL.Cache.ContentStore").Interfaces.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("Newtonsoft.Json").pkg,
],
diff --git a/Public/Src/Cache/VerticalStore/InMemory/BuildXL.Cache.InMemory.dsc b/Public/Src/Cache/VerticalStore/InMemory/BuildXL.Cache.InMemory.dsc
index 6eef37096..edfab7eaa 100644
--- a/Public/Src/Cache/VerticalStore/InMemory/BuildXL.Cache.InMemory.dsc
+++ b/Public/Src/Cache/VerticalStore/InMemory/BuildXL.Cache.InMemory.dsc
@@ -14,7 +14,6 @@ namespace InMemory {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
],
diff --git a/Public/Src/Cache/VerticalStore/InputListFilter/BuildXL.Cache.InputListFilter.dsc b/Public/Src/Cache/VerticalStore/InputListFilter/BuildXL.Cache.InputListFilter.dsc
index 71a3a7d4c..9e1fcfbd8 100644
--- a/Public/Src/Cache/VerticalStore/InputListFilter/BuildXL.Cache.InputListFilter.dsc
+++ b/Public/Src/Cache/VerticalStore/InputListFilter/BuildXL.Cache.InputListFilter.dsc
@@ -14,7 +14,6 @@ namespace InputListFilter {
importFrom("BuildXL.Engine").Scheduler.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
],
diff --git a/Public/Src/Cache/VerticalStore/Interfaces/BuildXL.Cache.Interfaces.dsc b/Public/Src/Cache/VerticalStore/Interfaces/BuildXL.Cache.Interfaces.dsc
index 4da3419f0..cb6ad3696 100644
--- a/Public/Src/Cache/VerticalStore/Interfaces/BuildXL.Cache.Interfaces.dsc
+++ b/Public/Src/Cache/VerticalStore/Interfaces/BuildXL.Cache.Interfaces.dsc
@@ -18,7 +18,6 @@ namespace Interfaces {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("Newtonsoft.Json").pkg,
diff --git a/Public/Src/Cache/VerticalStore/MemoizationStoreAdapter/BuildXL.Cache.MemoizationStoreAdapter.dsc b/Public/Src/Cache/VerticalStore/MemoizationStoreAdapter/BuildXL.Cache.MemoizationStoreAdapter.dsc
index dadbc2112..80cfbc374 100644
--- a/Public/Src/Cache/VerticalStore/MemoizationStoreAdapter/BuildXL.Cache.MemoizationStoreAdapter.dsc
+++ b/Public/Src/Cache/VerticalStore/MemoizationStoreAdapter/BuildXL.Cache.MemoizationStoreAdapter.dsc
@@ -11,7 +11,6 @@ namespace MemoizationStoreAdapter {
references: [
Interfaces.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/Cache/VerticalStore/UnitTests/Analyzer/Test.BuildXL.Cache.Analyzer.dsc b/Public/Src/Cache/VerticalStore/UnitTests/Analyzer/Test.BuildXL.Cache.Analyzer.dsc
index 3e11a83b7..e92ff1916 100644
--- a/Public/Src/Cache/VerticalStore/UnitTests/Analyzer/Test.BuildXL.Cache.Analyzer.dsc
+++ b/Public/Src/Cache/VerticalStore/UnitTests/Analyzer/Test.BuildXL.Cache.Analyzer.dsc
@@ -19,7 +19,6 @@ namespace Analyzer {
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
importFrom("BuildXL.Utilities").ToolSupport.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
Interfaces.dll,
diff --git a/Public/Src/Cache/VerticalStore/UnitTests/InputListFilter/Test.BuildXL.Cache.InputListFilter.dsc b/Public/Src/Cache/VerticalStore/UnitTests/InputListFilter/Test.BuildXL.Cache.InputListFilter.dsc
index 8dd5ce459..11c587d70 100644
--- a/Public/Src/Cache/VerticalStore/UnitTests/InputListFilter/Test.BuildXL.Cache.InputListFilter.dsc
+++ b/Public/Src/Cache/VerticalStore/UnitTests/InputListFilter/Test.BuildXL.Cache.InputListFilter.dsc
@@ -13,7 +13,6 @@ namespace InputListFilter {
importFrom("BuildXL.Cache.VerticalStore").InMemory.dll,
importFrom("BuildXL.Cache.VerticalStore").VerticalAggregator.dll,
importFrom("BuildXL.Engine").Scheduler.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
Interfaces.dll,
VerticalAggregator.dll,
diff --git a/Public/Src/Cache/VerticalStore/UnitTests/Interfaces/Test.BuildXL.Cache.Interfaces.dsc b/Public/Src/Cache/VerticalStore/UnitTests/Interfaces/Test.BuildXL.Cache.Interfaces.dsc
index 417d01dcf..208a4f473 100644
--- a/Public/Src/Cache/VerticalStore/UnitTests/Interfaces/Test.BuildXL.Cache.Interfaces.dsc
+++ b/Public/Src/Cache/VerticalStore/UnitTests/Interfaces/Test.BuildXL.Cache.Interfaces.dsc
@@ -19,7 +19,6 @@ namespace Interfaces {
importFrom("BuildXL.Cache.VerticalStore").ImplementationSupport.dll,
importFrom("BuildXL.Cache.VerticalStore").InMemory.dll,
importFrom("BuildXL.Cache.VerticalStore").Interfaces.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
],
});
}
diff --git a/Public/Src/Demos/BlockAccesses/BlockAccesses.dsc b/Public/Src/Demos/BlockAccesses/BlockAccesses.dsc
index e9aa7b028..6f29bdfbe 100644
--- a/Public/Src/Demos/BlockAccesses/BlockAccesses.dsc
+++ b/Public/Src/Demos/BlockAccesses/BlockAccesses.dsc
@@ -10,7 +10,6 @@ namespace BlockAccesses {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Engine").ProcessPipExecutor.dll,
importFrom("BuildXL.Pips").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Demos/ReportAccesses/ReportAccesses.dsc b/Public/Src/Demos/ReportAccesses/ReportAccesses.dsc
index 2e6f271da..bd3780e41 100644
--- a/Public/Src/Demos/ReportAccesses/ReportAccesses.dsc
+++ b/Public/Src/Demos/ReportAccesses/ReportAccesses.dsc
@@ -10,7 +10,6 @@ namespace ReportAccesses {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Engine").ProcessPipExecutor.dll,
importFrom("BuildXL.Pips").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Demos/ReportProcesses/ReportProcesses.dsc b/Public/Src/Demos/ReportProcesses/ReportProcesses.dsc
index 4f0ac71c2..bc5770922 100644
--- a/Public/Src/Demos/ReportProcesses/ReportProcesses.dsc
+++ b/Public/Src/Demos/ReportProcesses/ReportProcesses.dsc
@@ -10,7 +10,6 @@ namespace ReportProcesses {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Engine").ProcessPipExecutor.dll,
importFrom("BuildXL.Pips").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Deployment/NugetPackages.dsc b/Public/Src/Deployment/NugetPackages.dsc
index cd54f4f68..df239890f 100644
--- a/Public/Src/Deployment/NugetPackages.dsc
+++ b/Public/Src/Deployment/NugetPackages.dsc
@@ -112,12 +112,6 @@ namespace NugetPackages {
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Branding.dll,
importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).Branding.dll,
- // BuildXL.Collections
- importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Collections.dll,
- importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Collections.dll,
- importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Collections.dll,
- importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).Collections.dll,
-
// BuildXL.Interop
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Interop.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Interop.dll,
diff --git a/Public/Src/Engine/Cache.Plugin.CacheCore/BuildXL.Cache.Plugin.CacheCore.dsc b/Public/Src/Engine/Cache.Plugin.CacheCore/BuildXL.Cache.Plugin.CacheCore.dsc
index 673e3eae1..cda70303d 100644
--- a/Public/Src/Engine/Cache.Plugin.CacheCore/BuildXL.Cache.Plugin.CacheCore.dsc
+++ b/Public/Src/Engine/Cache.Plugin.CacheCore/BuildXL.Cache.Plugin.CacheCore.dsc
@@ -18,7 +18,6 @@ namespace Cache.Plugin.Core {
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
],
});
diff --git a/Public/Src/Engine/Cache/BuildXL.Cache.dsc b/Public/Src/Engine/Cache/BuildXL.Cache.dsc
index 74c3a0928..7392db4c4 100644
--- a/Public/Src/Engine/Cache/BuildXL.Cache.dsc
+++ b/Public/Src/Engine/Cache/BuildXL.Cache.dsc
@@ -32,7 +32,6 @@ namespace Cache {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("JsonDiffPatch.Net").pkg,
diff --git a/Public/Src/Engine/Dll/BuildXL.Engine.dsc b/Public/Src/Engine/Dll/BuildXL.Engine.dsc
index d8d7761c3..06e8a046d 100644
--- a/Public/Src/Engine/Dll/BuildXL.Engine.dsc
+++ b/Public/Src/Engine/Dll/BuildXL.Engine.dsc
@@ -42,7 +42,6 @@ namespace Engine {
importFrom("BuildXL.Ide").Generator.dll,
importFrom("BuildXL.Ide").Generator.Old.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Interop.dll,
diff --git a/Public/Src/Engine/ProcessPipExecutor/BuildXL.ProcessPipExecutor.dsc b/Public/Src/Engine/ProcessPipExecutor/BuildXL.ProcessPipExecutor.dsc
index 5985b2072..0068503c7 100644
--- a/Public/Src/Engine/ProcessPipExecutor/BuildXL.ProcessPipExecutor.dsc
+++ b/Public/Src/Engine/ProcessPipExecutor/BuildXL.ProcessPipExecutor.dsc
@@ -21,7 +21,6 @@ namespace ProcessPipExecutor {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Interop.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Plugin.dll,
importFrom("BuildXL.Utilities").PluginGrpc.dll,
diff --git a/Public/Src/Engine/Processes.External/BuildXL.Processes.External.dsc b/Public/Src/Engine/Processes.External/BuildXL.Processes.External.dsc
index 3a929f272..df135045a 100644
--- a/Public/Src/Engine/Processes.External/BuildXL.Processes.External.dsc
+++ b/Public/Src/Engine/Processes.External/BuildXL.Processes.External.dsc
@@ -27,7 +27,6 @@ namespace Processes.External {
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Interop.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Engine/Processes/BuildXL.Processes.dsc b/Public/Src/Engine/Processes/BuildXL.Processes.dsc
index 7ab1a441f..52ef1a572 100644
--- a/Public/Src/Engine/Processes/BuildXL.Processes.dsc
+++ b/Public/Src/Engine/Processes/BuildXL.Processes.dsc
@@ -35,7 +35,6 @@ namespace Processes {
),
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Interop.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
],
internalsVisibleTo: [
diff --git a/Public/Src/Engine/Scheduler/BuildXL.Scheduler.dsc b/Public/Src/Engine/Scheduler/BuildXL.Scheduler.dsc
index 6aad1766f..70a953bca 100644
--- a/Public/Src/Engine/Scheduler/BuildXL.Scheduler.dsc
+++ b/Public/Src/Engine/Scheduler/BuildXL.Scheduler.dsc
@@ -37,7 +37,6 @@ namespace Scheduler {
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Branding.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
diff --git a/Public/Src/Engine/UnitTests/Cache.Plugin.CacheCore/Test.BuildXL.Cache.Plugin.CacheCore.dsc b/Public/Src/Engine/UnitTests/Cache.Plugin.CacheCore/Test.BuildXL.Cache.Plugin.CacheCore.dsc
index ab1e1f2f5..3ab6c25c7 100644
--- a/Public/Src/Engine/UnitTests/Cache.Plugin.CacheCore/Test.BuildXL.Cache.Plugin.CacheCore.dsc
+++ b/Public/Src/Engine/UnitTests/Cache.Plugin.CacheCore/Test.BuildXL.Cache.Plugin.CacheCore.dsc
@@ -20,7 +20,6 @@ namespace Cache.Plugin.Core {
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
],
});
diff --git a/Public/Src/Engine/UnitTests/Cache/Test.BuildXL.Cache.dsc b/Public/Src/Engine/UnitTests/Cache/Test.BuildXL.Cache.dsc
index 731a16dd5..d6dd51e4e 100644
--- a/Public/Src/Engine/UnitTests/Cache/Test.BuildXL.Cache.dsc
+++ b/Public/Src/Engine/UnitTests/Cache/Test.BuildXL.Cache.dsc
@@ -19,7 +19,6 @@ namespace Cache {
importFrom("BuildXL.Utilities").Storage.dll,
importFrom("BuildXL.Utilities.UnitTests").StorageTestUtilities.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("Newtonsoft.Json").pkg,
],
diff --git a/Public/Src/Engine/UnitTests/Engine/Test.BuildXL.Engine.dsc b/Public/Src/Engine/UnitTests/Engine/Test.BuildXL.Engine.dsc
index 66a58aece..15c7b6a55 100644
--- a/Public/Src/Engine/UnitTests/Engine/Test.BuildXL.Engine.dsc
+++ b/Public/Src/Engine/UnitTests/Engine/Test.BuildXL.Engine.dsc
@@ -92,7 +92,6 @@ namespace Engine {
importFrom("BuildXL.Engine").ViewModel.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/Engine/UnitTests/EngineTestUtilities/Test.BuildXL.EngineTestUtilities.dsc b/Public/Src/Engine/UnitTests/EngineTestUtilities/Test.BuildXL.EngineTestUtilities.dsc
index 5e134648c..0ce6288a2 100644
--- a/Public/Src/Engine/UnitTests/EngineTestUtilities/Test.BuildXL.EngineTestUtilities.dsc
+++ b/Public/Src/Engine/UnitTests/EngineTestUtilities/Test.BuildXL.EngineTestUtilities.dsc
@@ -20,7 +20,6 @@ namespace EngineTestUtilities {
importFrom("BuildXL.Engine").Scheduler.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
diff --git a/Public/Src/Engine/UnitTests/ExternalToolTests/ExternalToolTest.BuildXL.Scheduler.dsc b/Public/Src/Engine/UnitTests/ExternalToolTests/ExternalToolTest.BuildXL.Scheduler.dsc
index 3f8b1d9e0..28f25f049 100644
--- a/Public/Src/Engine/UnitTests/ExternalToolTests/ExternalToolTest.BuildXL.Scheduler.dsc
+++ b/Public/Src/Engine/UnitTests/ExternalToolTests/ExternalToolTest.BuildXL.Scheduler.dsc
@@ -29,7 +29,6 @@ namespace ExternalToolTest {
importFrom("BuildXL.Engine").Scheduler.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Engine/UnitTests/Processes.Detours/Test.BuildXL.Processes.Detours.dsc b/Public/Src/Engine/UnitTests/Processes.Detours/Test.BuildXL.Processes.Detours.dsc
index f28f17ce1..942a9761e 100644
--- a/Public/Src/Engine/UnitTests/Processes.Detours/Test.BuildXL.Processes.Detours.dsc
+++ b/Public/Src/Engine/UnitTests/Processes.Detours/Test.BuildXL.Processes.Detours.dsc
@@ -47,7 +47,6 @@ namespace Processes.Detours {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Plugin.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Engine/UnitTests/Processes.TestPrograms/DetoursCrossBitTests/DetoursCrossBitTests.dsc b/Public/Src/Engine/UnitTests/Processes.TestPrograms/DetoursCrossBitTests/DetoursCrossBitTests.dsc
index 24a3bbfc4..39e5eecee 100644
--- a/Public/Src/Engine/UnitTests/Processes.TestPrograms/DetoursCrossBitTests/DetoursCrossBitTests.dsc
+++ b/Public/Src/Engine/UnitTests/Processes.TestPrograms/DetoursCrossBitTests/DetoursCrossBitTests.dsc
@@ -31,7 +31,6 @@ namespace Processes.TestPrograms.DetoursCrossBitTests {
importFrom("BuildXL.Utilities").Ipc.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Utilities.UnitTests").TestUtilities.dll,
diff --git a/Public/Src/Engine/UnitTests/Processes/Test.BuildXL.Processes.dsc b/Public/Src/Engine/UnitTests/Processes/Test.BuildXL.Processes.dsc
index 66c7c85ca..ee85558a0 100644
--- a/Public/Src/Engine/UnitTests/Processes/Test.BuildXL.Processes.dsc
+++ b/Public/Src/Engine/UnitTests/Processes/Test.BuildXL.Processes.dsc
@@ -56,7 +56,6 @@ namespace Processes {
importFrom("BuildXL.Engine").Scheduler.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Configuration.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/Engine/UnitTests/RuntimeAnalyzer/Test.BuildXL.RuntimeAnalyzer.dsc b/Public/Src/Engine/UnitTests/RuntimeAnalyzer/Test.BuildXL.RuntimeAnalyzer.dsc
index ee406f8dd..f32862d28 100644
--- a/Public/Src/Engine/UnitTests/RuntimeAnalyzer/Test.BuildXL.RuntimeAnalyzer.dsc
+++ b/Public/Src/Engine/UnitTests/RuntimeAnalyzer/Test.BuildXL.RuntimeAnalyzer.dsc
@@ -26,7 +26,6 @@ namespace Test.BuildXL.RuntimeAnalyzer {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Utilities.UnitTests").TestProcess.exe
],
diff --git a/Public/Src/Engine/UnitTests/Scheduler.IntegrationTest/IntegrationTest.BuildXL.Scheduler.dsc b/Public/Src/Engine/UnitTests/Scheduler.IntegrationTest/IntegrationTest.BuildXL.Scheduler.dsc
index e6ae92920..d95f2933e 100644
--- a/Public/Src/Engine/UnitTests/Scheduler.IntegrationTest/IntegrationTest.BuildXL.Scheduler.dsc
+++ b/Public/Src/Engine/UnitTests/Scheduler.IntegrationTest/IntegrationTest.BuildXL.Scheduler.dsc
@@ -35,7 +35,6 @@ namespace Scheduler.IntegrationTest {
importFrom("BuildXL.Engine").ViewModel.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Interop.dll,
diff --git a/Public/Src/Engine/UnitTests/Scheduler/Test.BuildXL.Scheduler.dsc b/Public/Src/Engine/UnitTests/Scheduler/Test.BuildXL.Scheduler.dsc
index c66fdca46..b44902331 100644
--- a/Public/Src/Engine/UnitTests/Scheduler/Test.BuildXL.Scheduler.dsc
+++ b/Public/Src/Engine/UnitTests/Scheduler/Test.BuildXL.Scheduler.dsc
@@ -47,7 +47,6 @@ namespace Scheduler {
importFrom("BuildXL.Engine").Scheduler.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities.Instrumentation").Tracing.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
diff --git a/Public/Src/FrontEnd/CMake.Serialization/BuildXL.FrontEnd.Ninja.Serialization.dsc b/Public/Src/FrontEnd/CMake.Serialization/BuildXL.FrontEnd.Ninja.Serialization.dsc
index ee10fef6b..b3056e818 100644
--- a/Public/Src/FrontEnd/CMake.Serialization/BuildXL.FrontEnd.Ninja.Serialization.dsc
+++ b/Public/Src/FrontEnd/CMake.Serialization/BuildXL.FrontEnd.Ninja.Serialization.dsc
@@ -10,7 +10,6 @@ namespace CMake.Serialization {
references: [
importFrom("Newtonsoft.Json").pkg,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
],
});
}
diff --git a/Public/Src/FrontEnd/CMake/BuildXL.FrontEnd.CMake.dsc b/Public/Src/FrontEnd/CMake/BuildXL.FrontEnd.CMake.dsc
index 11c726d8b..b5ffc9dd2 100644
--- a/Public/Src/FrontEnd/CMake/BuildXL.FrontEnd.CMake.dsc
+++ b/Public/Src/FrontEnd/CMake/BuildXL.FrontEnd.CMake.dsc
@@ -20,7 +20,6 @@ namespace CMake {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/FrontEnd/Core/BuildXL.FrontEnd.Core.dsc b/Public/Src/FrontEnd/Core/BuildXL.FrontEnd.Core.dsc
index a2b7ddae0..d35f6efa7 100644
--- a/Public/Src/FrontEnd/Core/BuildXL.FrontEnd.Core.dsc
+++ b/Public/Src/FrontEnd/Core/BuildXL.FrontEnd.Core.dsc
@@ -24,7 +24,6 @@ namespace Core {
importFrom("BuildXL.Engine").Cache.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/FrontEnd/Download/BuildXL.FrontEnd.Download.dsc b/Public/Src/FrontEnd/Download/BuildXL.FrontEnd.Download.dsc
index 506f08ffa..fd0794ccc 100644
--- a/Public/Src/FrontEnd/Download/BuildXL.FrontEnd.Download.dsc
+++ b/Public/Src/FrontEnd/Download/BuildXL.FrontEnd.Download.dsc
@@ -23,7 +23,6 @@ namespace Download {
importFrom("BuildXL.Cache.ContentStore").Hashing.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").Native.dll,
diff --git a/Public/Src/FrontEnd/Factory/BuildXL.FrontEnd.Factory.dsc b/Public/Src/FrontEnd/Factory/BuildXL.FrontEnd.Factory.dsc
index 3e4418c90..169939473 100644
--- a/Public/Src/FrontEnd/Factory/BuildXL.FrontEnd.Factory.dsc
+++ b/Public/Src/FrontEnd/Factory/BuildXL.FrontEnd.Factory.dsc
@@ -17,7 +17,6 @@ namespace Factory {
importFrom("BuildXL.Ide").Script.Debugger.dll,
importFrom("BuildXL.Ide").VSCode.DebugProtocol.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/FrontEnd/JavaScript/BuildXL.FrontEnd.JavaScript.dsc b/Public/Src/FrontEnd/JavaScript/BuildXL.FrontEnd.JavaScript.dsc
index a351d0f27..95ff4cb37 100644
--- a/Public/Src/FrontEnd/JavaScript/BuildXL.FrontEnd.JavaScript.dsc
+++ b/Public/Src/FrontEnd/JavaScript/BuildXL.FrontEnd.JavaScript.dsc
@@ -22,7 +22,6 @@ namespace JavaScript {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/FrontEnd/Lage/BuildXL.FrontEnd.Lage.dsc b/Public/Src/FrontEnd/Lage/BuildXL.FrontEnd.Lage.dsc
index 5a577dbb2..890553305 100644
--- a/Public/Src/FrontEnd/Lage/BuildXL.FrontEnd.Lage.dsc
+++ b/Public/Src/FrontEnd/Lage/BuildXL.FrontEnd.Lage.dsc
@@ -21,7 +21,6 @@ namespace Lage {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/FrontEnd/MsBuild/BuildXL.FrontEnd.MsBuild.dsc b/Public/Src/FrontEnd/MsBuild/BuildXL.FrontEnd.MsBuild.dsc
index 75add61f2..c23f1d836 100644
--- a/Public/Src/FrontEnd/MsBuild/BuildXL.FrontEnd.MsBuild.dsc
+++ b/Public/Src/FrontEnd/MsBuild/BuildXL.FrontEnd.MsBuild.dsc
@@ -19,7 +19,6 @@ namespace MsBuild {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/FrontEnd/Ninja.Serialization/BuildXL.FrontEnd.Ninja.Serialization.dsc b/Public/Src/FrontEnd/Ninja.Serialization/BuildXL.FrontEnd.Ninja.Serialization.dsc
index 1af1a73e7..add266ea4 100644
--- a/Public/Src/FrontEnd/Ninja.Serialization/BuildXL.FrontEnd.Ninja.Serialization.dsc
+++ b/Public/Src/FrontEnd/Ninja.Serialization/BuildXL.FrontEnd.Ninja.Serialization.dsc
@@ -10,7 +10,6 @@ namespace Ninja.Serialization {
references: [
importFrom("Newtonsoft.Json").pkg,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
],
});
diff --git a/Public/Src/FrontEnd/Ninja/BuildXL.FrontEnd.Ninja.dsc b/Public/Src/FrontEnd/Ninja/BuildXL.FrontEnd.Ninja.dsc
index 910b3ccb7..82a2697f4 100644
--- a/Public/Src/FrontEnd/Ninja/BuildXL.FrontEnd.Ninja.dsc
+++ b/Public/Src/FrontEnd/Ninja/BuildXL.FrontEnd.Ninja.dsc
@@ -20,7 +20,6 @@ namespace Ninja {
importFrom("BuildXL.Engine").ProcessPipExecutor.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc b/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc
index 50ae6c87f..199b9067f 100644
--- a/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc
+++ b/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc
@@ -37,7 +37,6 @@ namespace Nuget {
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").VstsAuthentication.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").Native.dll,
diff --git a/Public/Src/FrontEnd/Rush/BuildXL.FrontEnd.Rush.dsc b/Public/Src/FrontEnd/Rush/BuildXL.FrontEnd.Rush.dsc
index e89df2a12..6f58aa3ba 100644
--- a/Public/Src/FrontEnd/Rush/BuildXL.FrontEnd.Rush.dsc
+++ b/Public/Src/FrontEnd/Rush/BuildXL.FrontEnd.Rush.dsc
@@ -21,7 +21,6 @@ namespace Rush {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/FrontEnd/Script/BuildXL.FrontEnd.Script.dsc b/Public/Src/FrontEnd/Script/BuildXL.FrontEnd.Script.dsc
index 2e56539ca..139a5bdf6 100644
--- a/Public/Src/FrontEnd/Script/BuildXL.FrontEnd.Script.dsc
+++ b/Public/Src/FrontEnd/Script/BuildXL.FrontEnd.Script.dsc
@@ -32,7 +32,6 @@ namespace Script {
importFrom("BuildXL.Ide").VSCode.DebugProtocol.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Interop.dll,
diff --git a/Public/Src/FrontEnd/Sdk/BuildXL.FrontEnd.Sdk.dsc b/Public/Src/FrontEnd/Sdk/BuildXL.FrontEnd.Sdk.dsc
index f38dd111d..18b81a14f 100644
--- a/Public/Src/FrontEnd/Sdk/BuildXL.FrontEnd.Sdk.dsc
+++ b/Public/Src/FrontEnd/Sdk/BuildXL.FrontEnd.Sdk.dsc
@@ -19,7 +19,6 @@ namespace Sdk {
importFrom("BuildXL.Engine").Cache.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
diff --git a/Public/Src/FrontEnd/SdkTesting/Helper/BuildXL.FrontEnd.Script.Testing.Helper.dsc b/Public/Src/FrontEnd/SdkTesting/Helper/BuildXL.FrontEnd.Script.Testing.Helper.dsc
index 6e261d9c5..b28aebfb9 100644
--- a/Public/Src/FrontEnd/SdkTesting/Helper/BuildXL.FrontEnd.Script.Testing.Helper.dsc
+++ b/Public/Src/FrontEnd/SdkTesting/Helper/BuildXL.FrontEnd.Script.Testing.Helper.dsc
@@ -18,7 +18,6 @@ namespace Helper {
importFrom("BuildXL.Engine").Engine.dll,
importFrom("BuildXL.Engine").Scheduler.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.FrontEnd").Core.dll,
importFrom("BuildXL.FrontEnd").Script.dll,
importFrom("BuildXL.FrontEnd").Sdk.dll,
diff --git a/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/TypeScript.Net.dsc b/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/TypeScript.Net.dsc
index c60faddb1..337ffecc3 100644
--- a/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/TypeScript.Net.dsc
+++ b/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/TypeScript.Net.dsc
@@ -14,7 +14,6 @@ namespace TypeScript.Net {
NetFx.Microsoft.CSharp.dll
),
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
...addIf(BuildXLSdk.isFullFramework,
diff --git a/Public/Src/FrontEnd/UnitTests/Core/Test.BuildXL.FrontEnd.Core.dsc b/Public/Src/FrontEnd/UnitTests/Core/Test.BuildXL.FrontEnd.Core.dsc
index 80dad3941..81a66ccff 100644
--- a/Public/Src/FrontEnd/UnitTests/Core/Test.BuildXL.FrontEnd.Core.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Core/Test.BuildXL.FrontEnd.Core.dsc
@@ -25,7 +25,6 @@ namespace Core {
importFrom("BuildXL.FrontEnd").TypeScript.Net.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/Download/Test.BuildXL.FrontEnd.Download.dsc b/Public/Src/FrontEnd/UnitTests/Download/Test.BuildXL.FrontEnd.Download.dsc
index f64aacec6..36363e17b 100644
--- a/Public/Src/FrontEnd/UnitTests/Download/Test.BuildXL.FrontEnd.Download.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Download/Test.BuildXL.FrontEnd.Download.dsc
@@ -17,7 +17,6 @@ namespace Download {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/Lage/Test.BuildXL.FrontEnd.Lage.dsc b/Public/Src/FrontEnd/UnitTests/Lage/Test.BuildXL.FrontEnd.Lage.dsc
index 3ce9783e4..094a2cba4 100644
--- a/Public/Src/FrontEnd/UnitTests/Lage/Test.BuildXL.FrontEnd.Lage.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Lage/Test.BuildXL.FrontEnd.Lage.dsc
@@ -47,7 +47,6 @@ namespace Test.Lage {
importFrom("BuildXL.FrontEnd").SdkProjectGraph.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/MsBuild/Test.BuildXL.FrontEnd.MsBuild.dsc b/Public/Src/FrontEnd/UnitTests/MsBuild/Test.BuildXL.FrontEnd.MsBuild.dsc
index 152527829..b6e3c5a30 100644
--- a/Public/Src/FrontEnd/UnitTests/MsBuild/Test.BuildXL.FrontEnd.MsBuild.dsc
+++ b/Public/Src/FrontEnd/UnitTests/MsBuild/Test.BuildXL.FrontEnd.MsBuild.dsc
@@ -39,7 +39,6 @@ namespace Test.MsBuild {
importFrom("BuildXL.FrontEnd").SdkProjectGraph.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/Ninja/Test.BuildXL.FrontEnd.Ninja.dsc b/Public/Src/FrontEnd/UnitTests/Ninja/Test.BuildXL.FrontEnd.Ninja.dsc
index 514dd375a..2f05d4213 100644
--- a/Public/Src/FrontEnd/UnitTests/Ninja/Test.BuildXL.FrontEnd.Ninja.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Ninja/Test.BuildXL.FrontEnd.Ninja.dsc
@@ -17,7 +17,6 @@ namespace Test.Ninja {
sources: globR(d`.`, "*.cs"),
references: [
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/Nuget/Test.BuildXL.FrontEnd.Nuget.dsc b/Public/Src/FrontEnd/UnitTests/Nuget/Test.BuildXL.FrontEnd.Nuget.dsc
index 953b29ea3..b77360766 100644
--- a/Public/Src/FrontEnd/UnitTests/Nuget/Test.BuildXL.FrontEnd.Nuget.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Nuget/Test.BuildXL.FrontEnd.Nuget.dsc
@@ -23,7 +23,6 @@ namespace Nuget {
importFrom("BuildXL.FrontEnd").Sdk.dll,
importFrom("BuildXL.FrontEnd").TypeScript.Net.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/Rush/Test.BuildXL.FrontEnd.Rush.dsc b/Public/Src/FrontEnd/UnitTests/Rush/Test.BuildXL.FrontEnd.Rush.dsc
index 3c1c0c6b4..9c630f5ce 100644
--- a/Public/Src/FrontEnd/UnitTests/Rush/Test.BuildXL.FrontEnd.Rush.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Rush/Test.BuildXL.FrontEnd.Rush.dsc
@@ -69,7 +69,6 @@ namespace Test.Rush {
importFrom("BuildXL.FrontEnd").SdkProjectGraph.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/Script.Ast/Test.BuildXL.FrontEnd.Script.dsc b/Public/Src/FrontEnd/UnitTests/Script.Ast/Test.BuildXL.FrontEnd.Script.dsc
index bb3274e3a..0a2888070 100644
--- a/Public/Src/FrontEnd/UnitTests/Script.Ast/Test.BuildXL.FrontEnd.Script.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Script.Ast/Test.BuildXL.FrontEnd.Script.dsc
@@ -52,7 +52,6 @@ namespace Script {
importFrom("BuildXL.Engine").Scheduler.dll,
importFrom("BuildXL.Engine").ViewModel.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
importFrom("BuildXL.Utilities").Native.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/Script.TestBase/Test.BuildXL.FrontEnd.Script.TestBase.dsc b/Public/Src/FrontEnd/UnitTests/Script.TestBase/Test.BuildXL.FrontEnd.Script.TestBase.dsc
index b1cb772b1..5f0a58427 100644
--- a/Public/Src/FrontEnd/UnitTests/Script.TestBase/Test.BuildXL.FrontEnd.Script.TestBase.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Script.TestBase/Test.BuildXL.FrontEnd.Script.TestBase.dsc
@@ -19,7 +19,6 @@ namespace Script.TestBase {
importFrom("BuildXL.FrontEnd").Script.dll,
importFrom("BuildXL.FrontEnd").Sdk.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Utilities.UnitTests").TestUtilities.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/Script.Workspaces.Utilities/Test.BuildXL.FrontEnd.Workspaces.Utilities.dsc b/Public/Src/FrontEnd/UnitTests/Script.Workspaces.Utilities/Test.BuildXL.FrontEnd.Workspaces.Utilities.dsc
index 33e682c4e..a3f2e7130 100644
--- a/Public/Src/FrontEnd/UnitTests/Script.Workspaces.Utilities/Test.BuildXL.FrontEnd.Workspaces.Utilities.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Script.Workspaces.Utilities/Test.BuildXL.FrontEnd.Workspaces.Utilities.dsc
@@ -12,7 +12,6 @@ namespace Workspaces.Utilities {
importFrom("BuildXL.FrontEnd").TypeScript.Net.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Configuration.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/FrontEnd/UnitTests/Yarn/Test.BuildXL.FrontEnd.Yarn.dsc b/Public/Src/FrontEnd/UnitTests/Yarn/Test.BuildXL.FrontEnd.Yarn.dsc
index 10508a7a3..5fd8fda0d 100644
--- a/Public/Src/FrontEnd/UnitTests/Yarn/Test.BuildXL.FrontEnd.Yarn.dsc
+++ b/Public/Src/FrontEnd/UnitTests/Yarn/Test.BuildXL.FrontEnd.Yarn.dsc
@@ -44,7 +44,6 @@ namespace Test.Yarn {
importFrom("BuildXL.FrontEnd").SdkProjectGraph.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
diff --git a/Public/Src/FrontEnd/Utilities/BuildXL.FrontEnd.Utilities.dsc b/Public/Src/FrontEnd/Utilities/BuildXL.FrontEnd.Utilities.dsc
index 88a1c8ff3..17adcda48 100644
--- a/Public/Src/FrontEnd/Utilities/BuildXL.FrontEnd.Utilities.dsc
+++ b/Public/Src/FrontEnd/Utilities/BuildXL.FrontEnd.Utilities.dsc
@@ -12,7 +12,6 @@ namespace Utilities {
...BuildXLSdk.tplPackages,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").Native.dll,
diff --git a/Public/Src/FrontEnd/Yarn/BuildXL.FrontEnd.Yarn.dsc b/Public/Src/FrontEnd/Yarn/BuildXL.FrontEnd.Yarn.dsc
index b486cfc6e..1be4cf6c0 100644
--- a/Public/Src/FrontEnd/Yarn/BuildXL.FrontEnd.Yarn.dsc
+++ b/Public/Src/FrontEnd/Yarn/BuildXL.FrontEnd.Yarn.dsc
@@ -21,7 +21,6 @@ namespace Yarn {
importFrom("BuildXL.Engine").Processes.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
importFrom("BuildXL.Utilities").Storage.dll,
diff --git a/Public/Src/IDE/Debugger/BuildXL.Ide.Script.Debugger.dsc b/Public/Src/IDE/Debugger/BuildXL.Ide.Script.Debugger.dsc
index 78d273452..be74ae1df 100644
--- a/Public/Src/IDE/Debugger/BuildXL.Ide.Script.Debugger.dsc
+++ b/Public/Src/IDE/Debugger/BuildXL.Ide.Script.Debugger.dsc
@@ -14,7 +14,6 @@ namespace Script.Debugger {
VSCode.DebugProtocol.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.FrontEnd").Core.dll,
diff --git a/Public/Src/IDE/Generator.Old/BuildXL.Ide.Generator.Old.dsc b/Public/Src/IDE/Generator.Old/BuildXL.Ide.Generator.Old.dsc
index 4be5b3ff8..0622e6680 100644
--- a/Public/Src/IDE/Generator.Old/BuildXL.Ide.Generator.Old.dsc
+++ b/Public/Src/IDE/Generator.Old/BuildXL.Ide.Generator.Old.dsc
@@ -14,7 +14,6 @@ namespace Generator.Old {
NetFx.System.Xml.Linq.dll
),
importFrom("BuildXL.Engine").Scheduler.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
diff --git a/Public/Src/IDE/Generator/BuildXL.Ide.Generator.dsc b/Public/Src/IDE/Generator/BuildXL.Ide.Generator.dsc
index 259fac864..e4c5c3984 100644
--- a/Public/Src/IDE/Generator/BuildXL.Ide.Generator.dsc
+++ b/Public/Src/IDE/Generator/BuildXL.Ide.Generator.dsc
@@ -14,7 +14,6 @@ namespace Generator {
NetFx.System.Xml.Linq.dll
),
importFrom("BuildXL.Engine").Scheduler.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
diff --git a/Public/Src/IDE/LanguageServer/BuildXL.Ide.LanguageServer.dsc b/Public/Src/IDE/LanguageServer/BuildXL.Ide.LanguageServer.dsc
index 564a5994f..cc952f923 100644
--- a/Public/Src/IDE/LanguageServer/BuildXL.Ide.LanguageServer.dsc
+++ b/Public/Src/IDE/LanguageServer/BuildXL.Ide.LanguageServer.dsc
@@ -44,7 +44,6 @@ namespace LanguageService.Server {
importFrom("BuildXL.Tools").BxlScriptAnalyzer.exe,
importFrom("BuildXL.Tools").BxlPipGraphFragmentGenerator.exe,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
diff --git a/Public/Src/Pips/Dll/BuildXL.Pips.dsc b/Public/Src/Pips/Dll/BuildXL.Pips.dsc
index c47bf6566..d45a7529e 100644
--- a/Public/Src/Pips/Dll/BuildXL.Pips.dsc
+++ b/Public/Src/Pips/Dll/BuildXL.Pips.dsc
@@ -24,7 +24,6 @@ export const dll = BuildXLSdk.library({
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Utilities.Instrumentation").AriaCommon.dll,
diff --git a/Public/Src/Pips/UnitTests/Pips/Test.BuildXL.Pips.dsc b/Public/Src/Pips/UnitTests/Pips/Test.BuildXL.Pips.dsc
index b8246a65b..aa82557c8 100644
--- a/Public/Src/Pips/UnitTests/Pips/Test.BuildXL.Pips.dsc
+++ b/Public/Src/Pips/UnitTests/Pips/Test.BuildXL.Pips.dsc
@@ -23,7 +23,6 @@ namespace Core {
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
],
});
diff --git a/Public/Src/Tools/BxlPipGraphFragmentGenerator/BxlPipGraphFragmentGenerator.dsc b/Public/Src/Tools/BxlPipGraphFragmentGenerator/BxlPipGraphFragmentGenerator.dsc
index 200ccd65a..353923bdf 100644
--- a/Public/Src/Tools/BxlPipGraphFragmentGenerator/BxlPipGraphFragmentGenerator.dsc
+++ b/Public/Src/Tools/BxlPipGraphFragmentGenerator/BxlPipGraphFragmentGenerator.dsc
@@ -20,7 +20,6 @@ namespace BxlPipGraphFragmentGenerator {
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Configuration.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
diff --git a/Public/Src/Tools/BxlScriptAnalyzer/BxlScriptAnalyzer.dsc b/Public/Src/Tools/BxlScriptAnalyzer/BxlScriptAnalyzer.dsc
index cf60bdbd0..ecb309d83 100644
--- a/Public/Src/Tools/BxlScriptAnalyzer/BxlScriptAnalyzer.dsc
+++ b/Public/Src/Tools/BxlScriptAnalyzer/BxlScriptAnalyzer.dsc
@@ -21,7 +21,6 @@ namespace BxlScriptAnalyzer {
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Configuration.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Script.Constants.dll,
diff --git a/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc b/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc
index fe9ac94d0..8c1077db2 100644
--- a/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc
+++ b/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc
@@ -22,7 +22,6 @@ export namespace DropDaemon {
importFrom("BuildXL.Utilities.Instrumentation").Tracing.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Authentication.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
importFrom("BuildXL.Utilities").Ipc.Providers.dll,
importFrom("BuildXL.Utilities").Native.dll,
diff --git a/Public/Src/Tools/Execution.Analyzer/BxlAnalyzer.dsc b/Public/Src/Tools/Execution.Analyzer/BxlAnalyzer.dsc
index 865ee90df..589fb0fd5 100644
--- a/Public/Src/Tools/Execution.Analyzer/BxlAnalyzer.dsc
+++ b/Public/Src/Tools/Execution.Analyzer/BxlAnalyzer.dsc
@@ -55,7 +55,6 @@ namespace Execution.Analyzer {
importFrom("BuildXL.Utilities").ToolSupport.dll,
importFrom("BuildXL.Utilities.Instrumentation").AriaCommon.dll,
importFrom("BuildXL.Utilities.Instrumentation").Tracing.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("Newtonsoft.Json").pkg,
diff --git a/Public/Src/Tools/FileDownloader/Tool.FileDownloader.dsc b/Public/Src/Tools/FileDownloader/Tool.FileDownloader.dsc
index 99ecb8805..eb9f658a9 100644
--- a/Public/Src/Tools/FileDownloader/Tool.FileDownloader.dsc
+++ b/Public/Src/Tools/FileDownloader/Tool.FileDownloader.dsc
@@ -22,7 +22,6 @@ namespace FileDownloader {
references:[
importFrom("Newtonsoft.Json").pkg,
importFrom("BuildXL.Utilities").VstsAuthentication.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").ToolSupport.dll,
importFrom("BuildXL.Utilities").Storage.dll,
@@ -41,7 +40,6 @@ namespace FileDownloader {
skipDefaultReferences: true,
sources: globR(d`.`, "Extractor*.cs"),
references:[
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").ToolSupport.dll,
diff --git a/Public/Src/Tools/MaterializationDaemon/Tool.MaterializationDaemon.dsc b/Public/Src/Tools/MaterializationDaemon/Tool.MaterializationDaemon.dsc
index c888b778b..e197d1f7c 100644
--- a/Public/Src/Tools/MaterializationDaemon/Tool.MaterializationDaemon.dsc
+++ b/Public/Src/Tools/MaterializationDaemon/Tool.MaterializationDaemon.dsc
@@ -24,7 +24,6 @@ export const exe = !BuildXLSdk.isDaemonToolingEnabled ? undefined : BuildXLSdk.e
importFrom("BuildXL.Utilities").Ipc.Providers.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Tools").ServicePipDaemon.dll,
diff --git a/Public/Src/Tools/SandboxedProcessExecutor/SandboxedProcessExecutor.dsc b/Public/Src/Tools/SandboxedProcessExecutor/SandboxedProcessExecutor.dsc
index 78b8cf506..723cece47 100644
--- a/Public/Src/Tools/SandboxedProcessExecutor/SandboxedProcessExecutor.dsc
+++ b/Public/Src/Tools/SandboxedProcessExecutor/SandboxedProcessExecutor.dsc
@@ -18,7 +18,6 @@ namespace SandboxedProcessExecutor {
sources: globR(d`.`, "*.cs"),
references: [
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").ToolSupport.dll,
diff --git a/Public/Src/Tools/SymbolDaemon/Tool.SymbolDaemon.dsc b/Public/Src/Tools/SymbolDaemon/Tool.SymbolDaemon.dsc
index c24681e7d..6dd8b87b5 100644
--- a/Public/Src/Tools/SymbolDaemon/Tool.SymbolDaemon.dsc
+++ b/Public/Src/Tools/SymbolDaemon/Tool.SymbolDaemon.dsc
@@ -28,7 +28,6 @@ export const exe = !BuildXLSdk.isSymbolToolingEnabled ? undefined : BuildXLSdk.e
importFrom("BuildXL.Utilities").Ipc.Providers.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Tools").ServicePipDaemon.dll,
importFrom("ItemStore.Shared").pkg,
diff --git a/Public/Src/Tools/Tool.MsBuildGraphBuilder/Tool.MsBuildGraphBuilder.dsc b/Public/Src/Tools/Tool.MsBuildGraphBuilder/Tool.MsBuildGraphBuilder.dsc
index 615bce300..a2deb7f4d 100644
--- a/Public/Src/Tools/Tool.MsBuildGraphBuilder/Tool.MsBuildGraphBuilder.dsc
+++ b/Public/Src/Tools/Tool.MsBuildGraphBuilder/Tool.MsBuildGraphBuilder.dsc
@@ -21,7 +21,6 @@ namespace MsBuildGraphBuilder {
importFrom("Newtonsoft.Json").pkg,
importFrom("BuildXL.FrontEnd").MsBuild.Serialization.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Utilities").Native.dll,
...addIf(BuildXLSdk.isFullFramework, importFrom("System.Collections.Immutable.ForVBCS").pkg),
diff --git a/Public/Src/Tools/UnitTests/Analyzers/Test.Tool.Analyzers.dsc b/Public/Src/Tools/UnitTests/Analyzers/Test.Tool.Analyzers.dsc
index 39514fcfa..17b661c91 100644
--- a/Public/Src/Tools/UnitTests/Analyzers/Test.Tool.Analyzers.dsc
+++ b/Public/Src/Tools/UnitTests/Analyzers/Test.Tool.Analyzers.dsc
@@ -31,7 +31,6 @@ namespace Test.Tool.Analyzers {
importFrom("BuildXL.Pips").dll,
importFrom("BuildXL.Tools").Execution.Analyzer.exe,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Ipc.dll,
diff --git a/Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc b/Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc
index 1fd17dd05..f8fa48d65 100644
--- a/Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc
+++ b/Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc
@@ -18,9 +18,8 @@ namespace VBCSCompilerLogger {
importFrom("Microsoft.CodeAnalysis.VisualBasic.ForVBCS").pkg,
importFrom("Microsoft.CodeAnalysis.Common.ForVBCS").pkg,
importFrom("System.Collections.Immutable.ForVBCS").pkg,
- importFrom("BuildXL.Utilities").dll,
+ importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Utilities").Native.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Engine").Processes.dll,
NetFx.Netstandard.dll, // due to issue https://github.com/dotnet/standard/issues/542
],
@@ -50,9 +49,8 @@ namespace VBCSCompilerLogger {
importFrom("Microsoft.CodeAnalysis.Common.Old").pkg,
importFrom("Microsoft.CodeAnalysis.VisualBasic.Old").pkg,
importFrom("System.Collections.Immutable").pkg,
- importFrom("BuildXL.Utilities").dll,
+ importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Utilities").Native.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Engine").Processes.dll,
],
runtimeContent:[
diff --git a/Public/Src/Utilities/Collections/BuildXL.Utilities.Collections.dsc b/Public/Src/Utilities/Collections/BuildXL.Utilities.Collections.dsc
deleted file mode 100644
index 2c2375f3d..000000000
--- a/Public/Src/Utilities/Collections/BuildXL.Utilities.Collections.dsc
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-import * as Managed from "Sdk.Managed";
-namespace Collections {
-
- @@public
- export const dll = BuildXLSdk.library({
- assemblyName: "BuildXL.Utilities.Collections",
- allowUnsafeBlocks: true,
- sources: globR(d`.`, "*.cs"),
- nullable: true,
- internalsVisibleTo: [
- "Test.BuildXL.Utilities.Collections",
- ],
- references: [
- // IMPORTANT!!! Do not add non-bxl dependencies into this project, any non-bxl dependencies should go to BuildXL.Utilities instead
-
- ...addIfLazy(!BuildXLSdk.isDotNetCore, () => [
- NetFx.Netstandard.dll,
- importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
- ]),
- ]
- });
-}
diff --git a/Public/Src/Utilities/Collections/HashCodeHelper.cs b/Public/Src/Utilities/Collections/HashCodeHelper.cs
deleted file mode 100644
index 7ffc3758f..000000000
--- a/Public/Src/Utilities/Collections/HashCodeHelper.cs
+++ /dev/null
@@ -1,376 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Diagnostics.ContractsLight;
-
-namespace BuildXL.Utilities.Collections
-{
- ///
- /// This class provides some utility function to compute stable strong hash codes.
- ///
- internal static class HashCodeHelper
- {
-#pragma warning disable SA1139 // Use literal suffix notation instead of casting
-
- // Magic numbers known to provide good hash distributions.
- // See here: http://www.isthe.com/chongo/tech/comp/fnv/
- private const int Fnv1Prime32 = 16777619;
- private const int Fnv1Basis32 = unchecked((int)2166136261);
- private const long Fnv1Prime64 = 1099511628211;
- private const long Fnv1Basis64 = unchecked((long)14695981039346656037);
-#pragma warning restore SA1139 // Use literal suffix notation instead of casting
-
- ///
- /// Creates a strong hash code of a string
- ///
- public static int GetOrdinalHashCode(string value)
- {
- if (value == null)
- {
- return 0;
- }
-
- int hash = Fnv1Basis32;
- foreach (char c in value)
- {
- hash = Fold(hash, (short)c);
- }
-
- return hash;
- }
-
- ///
- /// Creates a strong hash code of a string
- ///
- public static long GetOrdinalHashCode64(string value)
- {
- if (value == null)
- {
- return 0;
- }
-
- long hash = Fnv1Basis64;
- foreach (char c in value)
- {
- hash = Fold(hash, (short)c);
- }
-
- return hash;
- }
-
- ///
- /// Creates a case-invariant stable strong hash code of string
- ///
- public static int GetOrdinalIgnoreCaseHashCode(string value)
- {
- if (value == null)
- {
- return 0;
- }
-
- int hash = Fnv1Basis32;
- foreach (char c in value)
- {
- hash = Fold(hash, (short)c.ToUpperInvariantFast());
- }
-
- return hash;
- }
-
- ///
- /// Creates a case-invariant stable strong hash code of string
- ///
- public static long GetOrdinalIgnoreCaseHashCode64(string value)
- {
- if (value == null)
- {
- return 0;
- }
-
- long hash = Fnv1Basis64;
- foreach (char c in value)
- {
- hash = Fold(hash, (short)c.ToUpperInvariantFast());
- }
-
- return hash;
- }
-
- ///
- /// Creates a stable strong hash code
- ///
- public static int GetHashCode(long value)
- {
- unchecked
- {
- return Combine((int)value, (int)(((ulong)value) >> 32));
- }
- }
-
- private static int Fold(int hash, byte value)
- {
- return unchecked((hash * Fnv1Prime32) ^ (int)value);
- }
-
- private static int Fold(int hash, short value)
- {
- unchecked
- {
- return Fold(
- Fold(
- hash,
- (byte)value),
- (byte)(((uint)value) >> 8));
- }
- }
-
- private static int Fold(int hash, int value)
- {
- unchecked
- {
- return Fold(
- Fold(
- Fold(
- Fold(
- hash,
- (byte)value),
- (byte)(((uint)value) >> 8)),
- (byte)(((uint)value) >> 16)),
- (byte)(((uint)value) >> 24));
- }
- }
-
- ///
- /// Combines two hash codes in a stable strong way.
- ///
- public static int Combine(int value0, int value1)
- {
- return Fold(Fold(Fnv1Basis32, value0), value1);
- }
-
- ///
- /// Combines three hash codes in a stable strong way.
- ///
- public static int Combine(int value0, int value1, int value2)
- {
- return Fold(Fold(Fold(Fnv1Basis32, value0), value1), value2);
- }
-
- ///
- /// Combines four hash codes in a stable strong way.
- ///
- public static int Combine(int value0, int value1, int value2, int value3)
- {
- return Fold(Fold(Fold(Fold(Fnv1Basis32, value0), value1), value2), value3);
- }
-
- ///
- /// Combines five hash codes in a stable strong way.
- ///
- public static int Combine(int value0, int value1, int value2, int value3, int value4)
- {
- return Fold(Fold(Fold(Fold(Fold(Fnv1Basis32, value0), value1), value2), value3), value4);
- }
-
- ///
- /// Combines six hash codes in a stable strong way.
- ///
- public static int Combine(int value0, int value1, int value2, int value3, int value4, int value5)
- {
- return Fold(Fold(Fold(Fold(Fold(Fold(Fnv1Basis32, value0), value1), value2), value3), value4), value5);
- }
-
- ///
- /// Combines seven hash codes in a stable strong way.
- ///
- public static int Combine(int value0, int value1, int value2, int value3, int value4, int value5, int value6)
- {
- return Fold(Fold(Fold(Fold(Fold(Fold(Fold(Fnv1Basis32, value0), value1), value2), value3), value4), value5), value6);
- }
-
- ///
- /// Combines eight hash codes in a stable strong way.
- ///
- public static int Combine(int value0, int value1, int value2, int value3, int value4, int value5, int value6, int value7)
- {
- return Fold(Fold(Fold(Fold(Fold(Fold(Fold(Fold(Fnv1Basis32, value0), value1), value2), value3), value4), value5), value6), value7);
- }
-
- ///
- /// Combines nine hash codes in a stable strong way.
- ///
- public static int Combine(int value0, int value1, int value2, int value3, int value4, int value5, int value6, int value7, int value8)
- {
- return Fold(
- Fold(Fold(Fold(Fold(Fold(Fold(Fold(Fold(Fnv1Basis32, value0), value1), value2), value3), value4), value5), value6), value7),
- value8);
- }
-
- ///
- /// Combines ten hash codes in a stable strong way.
- ///
- public static int Combine(
- int value0,
- int value1,
- int value2,
- int value3,
- int value4,
- int value5,
- int value6,
- int value7,
- int value8,
- int value9)
- {
- return
- Fold(
- Fold(
- Fold(Fold(Fold(Fold(Fold(Fold(Fold(Fold(Fnv1Basis32, value0), value1), value2), value3), value4), value5), value6), value7),
- value8),
- value9);
- }
-
- ///
- /// Combines the specified values.
- ///
- public static int Combine(int[] values)
- {
- if (values == null)
- {
- return 0;
- }
-
- int hash = Fnv1Basis32;
- foreach (int value in values)
- {
- hash = Fold(hash, value);
- }
-
- return hash;
- }
-
- ///
- /// Combines the specified values.
- ///
- public static int Combine(byte[] values)
- {
- if (values == null)
- {
- return 0;
- }
-
- int hash = Fnv1Basis32;
- foreach (byte value in values)
- {
- hash = Fold(hash, value);
- }
-
- return hash;
- }
-
- private static long Fold(long hash, byte value)
- {
- unchecked
- {
- return (hash * Fnv1Prime64) ^ (long)value;
- }
- }
-
- private static long Fold(long hash, short value)
- {
- unchecked
- {
- return Fold(
- Fold(
- hash,
- (byte)value),
- (byte)(((uint)value) >> 8));
- }
- }
-
- private static long Fold(long hash, long value)
- {
- unchecked
- {
- return Fold(
- Fold(
- Fold(
- Fold(
- Fold(
- Fold(
- Fold(
- Fold(
- hash,
- (byte)value),
- (byte)(((uint)value) >> 8)),
- (byte)(((uint)value) >> 16)),
- (byte)(((uint)value) >> 24)),
- (byte)(((ulong)value) >> 32)),
- (byte)(((ulong)value) >> 40)),
- (byte)(((ulong)value) >> 48)),
- (byte)(((ulong)value) >> 56));
- }
- }
-
- ///
- /// Combines two hash codes in a stable strong way.
- ///
- public static long Combine(long value0, long value1)
- {
- return Fold(Fold(Fnv1Basis64, value0), value1);
- }
-
- ///
- /// Combines three hash codes in a stable strong way.
- ///
- public static long Combine(long value0, long value1, long value2)
- {
- return Fold(Fold(Fold(Fnv1Basis64, value0), value1), value2);
- }
-
- ///
- /// Combines four hash codes in a stable strong way.
- ///
- [SuppressMessage("Microsoft.Design", "CA1025:ReplaceRepetitiveArgumentsWithParamsArray")]
- public static long Combine(long value0, long value1, long value2, long value3)
- {
- return Fold(Fold(Fold(Fold(Fnv1Basis64, value0), value1), value2), value3);
- }
-
- /// An array containing useful prime numbers in the positive integer range.
- private static readonly int[] s_primes =
- {
- 3, 7, 11, 17, 23, 29, 37, 47, 59, 71, 89, 107, 131, 163, 197, 239, 293, 353,
- 431, 521, 631, 761, 919, 1103, 1327, 1597, 1931, 2333, 2801, 3371, 4049, 4861, 5839, 7013, 8419, 10103,
- 12143, 14591, 17519, 21023, 25229, 30293, 36353, 43627, 52361, 62851, 75431, 90523, 108631, 130363, 156437,
- 187751, 225307, 270371, 324449, 389357, 467237, 560689, 672827, 807403, 968897, 1162687, 1395263, 1674319,
- 2009191, 2411033, 2893249, 3471899, 4166287, 4999559, 5999471, 7199369, 8639249, 10367101, 12440537,
- 14928671, 17914409, 21497293, 25796759, 30956117, 37147349, 44576837, 53492207, 64190669, 77028803, 92434613,
- 110921543, 133105859, 159727031, 191672443, 230006941, 276008387, 331210079, 397452101, 476942527,
- 572331049, 686797261, 824156741, 988988137, 1186785773, 1424142949, 1708971541, 2050765853,
- };
-
- /// Returns a prime number which is >= to the input.
- ///
- /// The set of supported is primes is by no means exhaustive and represents a subset useful for use with
- /// hash tables of variable sizes.
- ///
- public static int GetGreaterOrEqualPrime(int minValue)
- {
- Contract.Requires(minValue >= 0);
-
- for (int i = 0; i < s_primes.Length; i++)
- {
- int prime = s_primes[i];
- Contract.Assume(prime > 0);
- if (prime >= minValue)
- {
- return prime;
- }
- }
-
- // 2**31 - 1, which is prime
- return 2147483647;
- }
- }
-}
diff --git a/Public/Src/Utilities/Configuration/BuildXL.Utilities.Configuration.dsc b/Public/Src/Utilities/Configuration/BuildXL.Utilities.Configuration.dsc
index 9794807bc..e9709ca61 100644
--- a/Public/Src/Utilities/Configuration/BuildXL.Utilities.Configuration.dsc
+++ b/Public/Src/Utilities/Configuration/BuildXL.Utilities.Configuration.dsc
@@ -17,7 +17,6 @@ namespace Configuration {
$.dll,
Interop.dll,
Utilities.Core.dll,
- $.Collections.dll,
],
});
}
diff --git a/Public/Src/Utilities/Instrumentation/LogGen/BuildXL.LogGen.dsc b/Public/Src/Utilities/Instrumentation/LogGen/BuildXL.LogGen.dsc
index 4646fd8f0..4fe70426a 100644
--- a/Public/Src/Utilities/Instrumentation/LogGen/BuildXL.LogGen.dsc
+++ b/Public/Src/Utilities/Instrumentation/LogGen/BuildXL.LogGen.dsc
@@ -12,7 +12,6 @@ namespace LogGen {
references: [
AriaCommon.dll,
Core.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("BuildXL.Utilities").ToolSupport.dll,
importFrom("BuildXL.Utilities").CodeGenerationHelper.dll,
diff --git a/Public/Src/Utilities/KeyValueStore/BuildXL.KeyValueStore.dsc b/Public/Src/Utilities/KeyValueStore/BuildXL.KeyValueStore.dsc
index 569bfb117..e3943d284 100644
--- a/Public/Src/Utilities/KeyValueStore/BuildXL.KeyValueStore.dsc
+++ b/Public/Src/Utilities/KeyValueStore/BuildXL.KeyValueStore.dsc
@@ -18,7 +18,6 @@ namespace KeyValueStore {
NetFx.System.Text.Encoding.dll
),
$.dll,
- Collections.dll,
Native.dll,
Utilities.Core.dll,
...importFrom("Sdk.Selfhost.RocksDbSharp").pkgs,
diff --git a/Public/Src/Utilities/Native/BuildXL.Native.dsc b/Public/Src/Utilities/Native/BuildXL.Native.dsc
index dffe1f4bb..c4b13b04a 100644
--- a/Public/Src/Utilities/Native/BuildXL.Native.dsc
+++ b/Public/Src/Utilities/Native/BuildXL.Native.dsc
@@ -65,7 +65,6 @@ namespace Native {
references: [
Interop.dll,
...securityDlls,
- Collections.dll,
Utilities.Core.dll,
importFrom("CopyOnWrite").pkg,
],
diff --git a/Public/Src/Utilities/PackedExecution/BuildXL.Utilities.PackedExecution.dsc b/Public/Src/Utilities/PackedExecution/BuildXL.Utilities.PackedExecution.dsc
index 44775fba7..7f9a3190c 100644
--- a/Public/Src/Utilities/PackedExecution/BuildXL.Utilities.PackedExecution.dsc
+++ b/Public/Src/Utilities/PackedExecution/BuildXL.Utilities.PackedExecution.dsc
@@ -16,9 +16,8 @@ namespace PackedExecution {
...globR(d`.`, "*.cs"),
],
references: [
- $.dll,
+ Utilities.Core.dll,
PackedTable.dll,
- Collections.dll,
Native.dll,
],
});
diff --git a/Public/Src/Utilities/PackedTable/BuildXL.Utilities.PackedTable.dsc b/Public/Src/Utilities/PackedTable/BuildXL.Utilities.PackedTable.dsc
index cbe8e6bd6..0ec4af2ea 100644
--- a/Public/Src/Utilities/PackedTable/BuildXL.Utilities.PackedTable.dsc
+++ b/Public/Src/Utilities/PackedTable/BuildXL.Utilities.PackedTable.dsc
@@ -17,7 +17,6 @@ namespace PackedTable {
],
references: [
$.dll,
- Collections.dll,
Native.dll,
Utilities.Core.dll,
],
diff --git a/Public/Src/Utilities/Storage/BuildXL.Storage.dsc b/Public/Src/Utilities/Storage/BuildXL.Storage.dsc
index a064699ad..85c323f3d 100644
--- a/Public/Src/Utilities/Storage/BuildXL.Storage.dsc
+++ b/Public/Src/Utilities/Storage/BuildXL.Storage.dsc
@@ -14,7 +14,6 @@ namespace Storage {
references: [
$.dll,
Native.dll,
- Collections.dll,
Configuration.dll,
Utilities.Core.dll,
importFrom("BuildXL.Cache.ContentStore").Hashing.dll,
diff --git a/Public/Src/Utilities/ToolSupport/BuildXL.ToolSupport.dsc b/Public/Src/Utilities/ToolSupport/BuildXL.ToolSupport.dsc
index a5183d7cd..59495caa7 100644
--- a/Public/Src/Utilities/ToolSupport/BuildXL.ToolSupport.dsc
+++ b/Public/Src/Utilities/ToolSupport/BuildXL.ToolSupport.dsc
@@ -10,7 +10,6 @@ namespace ToolSupport {
sources: globR(d`.`, "*.cs"),
references: [
$.dll,
- Collections.dll,
Utilities.Core.dll
],
});
diff --git a/Public/Src/Utilities/UnitTests/Collections/Test.BuildXL.Utilities.Collections.dsc b/Public/Src/Utilities/UnitTests/Collections/Test.BuildXL.Utilities.Collections.dsc
index c4f8306b5..1d074834d 100644
--- a/Public/Src/Utilities/UnitTests/Collections/Test.BuildXL.Utilities.Collections.dsc
+++ b/Public/Src/Utilities/UnitTests/Collections/Test.BuildXL.Utilities.Collections.dsc
@@ -7,7 +7,6 @@ namespace Collections {
assemblyName: "Test.BuildXL.Utilities.Collections",
sources: globR(d`.`, "*.cs"),
references: [
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
diff --git a/Public/Src/Utilities/UnitTests/PackedExecutionTests/Test.BuildXL.Utilities.PackedExecution.dsc b/Public/Src/Utilities/UnitTests/PackedExecutionTests/Test.BuildXL.Utilities.PackedExecution.dsc
index 23531b1b1..1172b28a5 100644
--- a/Public/Src/Utilities/UnitTests/PackedExecutionTests/Test.BuildXL.Utilities.PackedExecution.dsc
+++ b/Public/Src/Utilities/UnitTests/PackedExecutionTests/Test.BuildXL.Utilities.PackedExecution.dsc
@@ -29,7 +29,6 @@ namespace PackedExecution {
importFrom("BuildXL.Tools").Execution.Analyzer.exe,
importFrom("BuildXL.Tools.UnitTests").Test.Tool.Analyzers.dll,
importFrom("BuildXL.Utilities").dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").Native.dll,
diff --git a/Public/Src/Utilities/UnitTests/Storage/Test.BuildXL.Storage.dsc b/Public/Src/Utilities/UnitTests/Storage/Test.BuildXL.Storage.dsc
index 3ad490733..55fb2eafa 100644
--- a/Public/Src/Utilities/UnitTests/Storage/Test.BuildXL.Storage.dsc
+++ b/Public/Src/Utilities/UnitTests/Storage/Test.BuildXL.Storage.dsc
@@ -25,7 +25,6 @@ namespace Storage {
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Storage.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
...importFrom("BuildXL.Utilities").Native.securityDlls,
diff --git a/Public/Src/Utilities/UnitTests/TestUtilities/Test.BuildXL.TestUtilities.dsc b/Public/Src/Utilities/UnitTests/TestUtilities/Test.BuildXL.TestUtilities.dsc
index 943cbf4ff..28859fe6b 100644
--- a/Public/Src/Utilities/UnitTests/TestUtilities/Test.BuildXL.TestUtilities.dsc
+++ b/Public/Src/Utilities/UnitTests/TestUtilities/Test.BuildXL.TestUtilities.dsc
@@ -14,7 +14,6 @@ namespace TestUtilities {
),
...importFrom("BuildXL.Utilities").Native.securityDlls,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").dll,
importFrom("BuildXL.Utilities").Native.dll,
diff --git a/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc b/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc
index 5e0301fb1..cf6b432fa 100644
--- a/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc
+++ b/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc
@@ -23,7 +23,6 @@ namespace Core {
importFrom("BuildXL.Utilities").Native.dll,
importFrom("BuildXL.Utilities").Interop.dll,
importFrom("BuildXL.Utilities").ToolSupport.dll,
- importFrom("BuildXL.Utilities").Collections.dll,
importFrom("BuildXL.Utilities").Configuration.dll,
importFrom("BuildXL.Utilities").Utilities.Core.dll,
importFrom("Newtonsoft.Json").pkg,
diff --git a/Public/Src/Utilities/Utilities.Core/BuildXL.Utilities.Core.dsc b/Public/Src/Utilities/Utilities.Core/BuildXL.Utilities.Core.dsc
index 9c30b4b8c..ac857880f 100644
--- a/Public/Src/Utilities/Utilities.Core/BuildXL.Utilities.Core.dsc
+++ b/Public/Src/Utilities/Utilities.Core/BuildXL.Utilities.Core.dsc
@@ -19,7 +19,6 @@ namespace Utilities.Core {
importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
importFrom("System.Threading.Tasks.Extensions").pkg,
]),
- Collections.dll,
Interop.dll,
],
internalsVisibleTo: [
@@ -30,6 +29,7 @@ namespace Utilities.Core {
"Test.BuildXL.Pips",
"Test.BuildXL.Scheduler",
"Test.BuildXL.Utilities",
+ "Test.BuildXL.Utilities.Collections",
"Test.BuildXL.FrontEnd.Script",
"IntegrationTest.BuildXL.Scheduler",
],
diff --git a/Public/Src/Utilities/Collections/ArrayView.cs b/Public/Src/Utilities/Utilities.Core/Collections/ArrayView.cs
similarity index 96%
rename from Public/Src/Utilities/Collections/ArrayView.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ArrayView.cs
index 41aa7f2f0..8355d52af 100644
--- a/Public/Src/Utilities/Collections/ArrayView.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/ArrayView.cs
@@ -4,6 +4,9 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.ContractsLight;
+using BuildXL.Utilities.Core;
+
+#nullable enable
namespace BuildXL.Utilities.Collections
{
diff --git a/Public/Src/Utilities/Collections/BigBuffer.cs b/Public/Src/Utilities/Utilities.Core/Collections/BigBuffer.cs
similarity index 97%
rename from Public/Src/Utilities/Collections/BigBuffer.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/BigBuffer.cs
index 2de9aac25..d8e410783 100644
--- a/Public/Src/Utilities/Collections/BigBuffer.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/BigBuffer.cs
@@ -7,6 +7,8 @@ using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/BitSet.cs b/Public/Src/Utilities/Utilities.Core/Collections/BitSet.cs
similarity index 97%
rename from Public/Src/Utilities/Collections/BitSet.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/BitSet.cs
index 7d8612dc6..fb6b697e2 100644
--- a/Public/Src/Utilities/Collections/BitSet.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/BitSet.cs
@@ -8,6 +8,8 @@ using System.Diagnostics.ContractsLight;
using System.IO;
using System.Threading;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/Bits.cs b/Public/Src/Utilities/Utilities.Core/Collections/Bits.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/Bits.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/Bits.cs
diff --git a/Public/Src/Utilities/Collections/BloomFilter.cs b/Public/Src/Utilities/Utilities.Core/Collections/BloomFilter.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/BloomFilter.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/BloomFilter.cs
diff --git a/Public/Src/Utilities/Collections/BoxRef.cs b/Public/Src/Utilities/Utilities.Core/Collections/BoxRef.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/BoxRef.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/BoxRef.cs
diff --git a/Public/Src/Utilities/Collections/Buffer.cs b/Public/Src/Utilities/Utilities.Core/Collections/Buffer.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/Buffer.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/Buffer.cs
diff --git a/Public/Src/Utilities/Collections/BufferPointer.cs b/Public/Src/Utilities/Utilities.Core/Collections/BufferPointer.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/BufferPointer.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/BufferPointer.cs
diff --git a/Public/Src/Utilities/Collections/CharUtilities.cs b/Public/Src/Utilities/Utilities.Core/Collections/CharUtilities.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/CharUtilities.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/CharUtilities.cs
diff --git a/Public/Src/Utilities/Collections/CollectionUtilities.Empty.Collections.cs b/Public/Src/Utilities/Utilities.Core/Collections/CollectionUtilities.Empty.Collections.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/CollectionUtilities.Empty.Collections.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/CollectionUtilities.Empty.Collections.cs
diff --git a/Public/Src/Utilities/Collections/CollectionUtilities.cs b/Public/Src/Utilities/Utilities.Core/Collections/CollectionUtilities.cs
similarity index 97%
rename from Public/Src/Utilities/Collections/CollectionUtilities.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/CollectionUtilities.cs
index f16899247..15e8d2fcf 100644
--- a/Public/Src/Utilities/Collections/CollectionUtilities.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/CollectionUtilities.cs
@@ -8,6 +8,8 @@ using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.ContractsLight;
using System.Linq;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/CompactSet.cs b/Public/Src/Utilities/Utilities.Core/Collections/CompactSet.cs
similarity index 96%
rename from Public/Src/Utilities/Collections/CompactSet.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/CompactSet.cs
index c020a0186..9e281382f 100644
--- a/Public/Src/Utilities/Collections/CompactSet.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/CompactSet.cs
@@ -8,6 +8,8 @@ using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.ContractsLight;
using System.Linq;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/ConcurrentArrayList.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentArrayList.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ConcurrentArrayList.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentArrayList.cs
diff --git a/Public/Src/Utilities/Collections/ConcurrentBigMap.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBigMap.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ConcurrentBigMap.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBigMap.cs
diff --git a/Public/Src/Utilities/Collections/ConcurrentBigSet.Buckets.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBigSet.Buckets.cs
similarity index 97%
rename from Public/Src/Utilities/Collections/ConcurrentBigSet.Buckets.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBigSet.Buckets.cs
index 5ab879c64..cd43b2b6c 100644
--- a/Public/Src/Utilities/Collections/ConcurrentBigSet.Buckets.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBigSet.Buckets.cs
@@ -7,6 +7,9 @@ using System.IO;
using System.Runtime.CompilerServices;
using System.Threading;
+#nullable enable
+
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/ConcurrentBigSet.Locks.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBigSet.Locks.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ConcurrentBigSet.Locks.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBigSet.Locks.cs
diff --git a/Public/Src/Utilities/Collections/ConcurrentBigSet.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBigSet.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ConcurrentBigSet.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBigSet.cs
diff --git a/Public/Src/Utilities/Collections/ConcurrentBitArray.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBitArray.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ConcurrentBitArray.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBitArray.cs
diff --git a/Public/Src/Utilities/Collections/ConcurrentBoundedSortedCollection.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBoundedSortedCollection.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ConcurrentBoundedSortedCollection.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentBoundedSortedCollection.cs
diff --git a/Public/Src/Utilities/Collections/ConcurrentDenseIndex.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentDenseIndex.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ConcurrentDenseIndex.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentDenseIndex.cs
diff --git a/Public/Src/Utilities/Collections/ConcurrentDrainingPriorityQueue.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentDrainingPriorityQueue.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ConcurrentDrainingPriorityQueue.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentDrainingPriorityQueue.cs
diff --git a/Public/Src/Utilities/Collections/ConcurrentPriorityQueue.cs b/Public/Src/Utilities/Utilities.Core/Collections/ConcurrentPriorityQueue.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ConcurrentPriorityQueue.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ConcurrentPriorityQueue.cs
diff --git a/Public/Src/Utilities/Collections/DictionaryExtensions.cs b/Public/Src/Utilities/Utilities.Core/Collections/DictionaryExtensions.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/DictionaryExtensions.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/DictionaryExtensions.cs
diff --git a/Public/Src/Utilities/Collections/DisposeAction.cs b/Public/Src/Utilities/Utilities.Core/Collections/DisposeAction.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/DisposeAction.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/DisposeAction.cs
diff --git a/Public/Src/Utilities/Collections/HashSetExtensions.cs b/Public/Src/Utilities/Utilities.Core/Collections/HashSetExtensions.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/HashSetExtensions.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/HashSetExtensions.cs
diff --git a/Public/Src/Utilities/Collections/IComparerExtensions.cs b/Public/Src/Utilities/Utilities.Core/Collections/IComparerExtensions.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/IComparerExtensions.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/IComparerExtensions.cs
diff --git a/Public/Src/Utilities/Collections/ICompatibleComparer.cs b/Public/Src/Utilities/Utilities.Core/Collections/ICompatibleComparer.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ICompatibleComparer.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ICompatibleComparer.cs
diff --git a/Public/Src/Utilities/Collections/IPendingSetItem.cs b/Public/Src/Utilities/Utilities.Core/Collections/IPendingSetItem.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/IPendingSetItem.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/IPendingSetItem.cs
diff --git a/Public/Src/Utilities/Collections/IReadOnlySet.cs b/Public/Src/Utilities/Utilities.Core/Collections/IReadOnlySet.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/IReadOnlySet.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/IReadOnlySet.cs
diff --git a/Public/Src/Utilities/Collections/ItemCompletedEventArgs.cs b/Public/Src/Utilities/Utilities.Core/Collections/ItemCompletedEventArgs.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ItemCompletedEventArgs.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ItemCompletedEventArgs.cs
diff --git a/Public/Src/Utilities/Collections/ItemResources.cs b/Public/Src/Utilities/Utilities.Core/Collections/ItemResources.cs
similarity index 96%
rename from Public/Src/Utilities/Collections/ItemResources.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ItemResources.cs
index abdb19d3d..b2b4e26e8 100644
--- a/Public/Src/Utilities/Collections/ItemResources.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/ItemResources.cs
@@ -4,6 +4,8 @@
using System;
using System.Diagnostics.CodeAnalysis;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/ItemSemaphoreQueuedEventArgs.cs b/Public/Src/Utilities/Utilities.Core/Collections/ItemSemaphoreQueuedEventArgs.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ItemSemaphoreQueuedEventArgs.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ItemSemaphoreQueuedEventArgs.cs
diff --git a/Public/Src/Utilities/Collections/MinMaxHeap.cs b/Public/Src/Utilities/Utilities.Core/Collections/MinMaxHeap.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/MinMaxHeap.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/MinMaxHeap.cs
diff --git a/Public/Src/Utilities/Collections/MultiValueDictionary.cs b/Public/Src/Utilities/Utilities.Core/Collections/MultiValueDictionary.cs
similarity index 96%
rename from Public/Src/Utilities/Collections/MultiValueDictionary.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/MultiValueDictionary.cs
index 3caa2ae20..c588c2314 100644
--- a/Public/Src/Utilities/Collections/MultiValueDictionary.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/MultiValueDictionary.cs
@@ -7,6 +7,8 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/ObjectCache.cs b/Public/Src/Utilities/Utilities.Core/Collections/ObjectCache.cs
similarity index 96%
rename from Public/Src/Utilities/Collections/ObjectCache.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ObjectCache.cs
index 46b460fbf..f1ffc836d 100644
--- a/Public/Src/Utilities/Collections/ObjectCache.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/ObjectCache.cs
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics.ContractsLight;
using System.Threading;
+using BuildXL.Utilities.Core;
#nullable disable // Disabling nullability for generic type
diff --git a/Public/Src/Utilities/Collections/PriorityQueue.cs b/Public/Src/Utilities/Utilities.Core/Collections/PriorityQueue.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/PriorityQueue.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/PriorityQueue.cs
diff --git a/Public/Src/Utilities/Collections/Range.cs b/Public/Src/Utilities/Utilities.Core/Collections/Range.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/Range.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/Range.cs
diff --git a/Public/Src/Utilities/Collections/ReadOnlyArray.cs b/Public/Src/Utilities/Utilities.Core/Collections/ReadOnlyArray.cs
similarity index 96%
rename from Public/Src/Utilities/Collections/ReadOnlyArray.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ReadOnlyArray.cs
index 009d213bb..3a152ee54 100644
--- a/Public/Src/Utilities/Collections/ReadOnlyArray.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/ReadOnlyArray.cs
@@ -8,6 +8,8 @@ using System.Diagnostics.ContractsLight;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/ReadOnlyListEnumerable.cs b/Public/Src/Utilities/Utilities.Core/Collections/ReadOnlyListEnumerable.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ReadOnlyListEnumerable.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ReadOnlyListEnumerable.cs
diff --git a/Public/Src/Utilities/Collections/ReadWriteLock.cs b/Public/Src/Utilities/Utilities.Core/Collections/ReadWriteLock.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/ReadWriteLock.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ReadWriteLock.cs
diff --git a/Public/Src/Utilities/Collections/ScopedReferenceMap.cs b/Public/Src/Utilities/Utilities.Core/Collections/ScopedReferenceMap.cs
similarity index 96%
rename from Public/Src/Utilities/Collections/ScopedReferenceMap.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/ScopedReferenceMap.cs
index aef9f9832..d65d3f547 100644
--- a/Public/Src/Utilities/Collections/ScopedReferenceMap.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/ScopedReferenceMap.cs
@@ -5,6 +5,8 @@ using System;
using System.Collections.Generic;
using System.Diagnostics.ContractsLight;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/SelectList.cs b/Public/Src/Utilities/Utilities.Core/Collections/SelectList.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/SelectList.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/SelectList.cs
diff --git a/Public/Src/Utilities/Collections/SemaphoreSet.cs b/Public/Src/Utilities/Utilities.Core/Collections/SemaphoreSet.cs
similarity index 97%
rename from Public/Src/Utilities/Collections/SemaphoreSet.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/SemaphoreSet.cs
index e4b6dce1e..02fbe6cda 100644
--- a/Public/Src/Utilities/Collections/SemaphoreSet.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/SemaphoreSet.cs
@@ -6,6 +6,8 @@ using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Diagnostics.ContractsLight;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/SortedReadOnlyArray.cs b/Public/Src/Utilities/Utilities.Core/Collections/SortedReadOnlyArray.cs
similarity index 97%
rename from Public/Src/Utilities/Collections/SortedReadOnlyArray.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/SortedReadOnlyArray.cs
index 095ea1e1e..d11a02dd4 100644
--- a/Public/Src/Utilities/Collections/SortedReadOnlyArray.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/SortedReadOnlyArray.cs
@@ -8,6 +8,8 @@ using System.Diagnostics.ContractsLight;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/SpanSortHelper.cs b/Public/Src/Utilities/Utilities.Core/Collections/SpanSortHelper.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/SpanSortHelper.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/SpanSortHelper.cs
diff --git a/Public/Src/Utilities/Collections/StreamUtilities.cs b/Public/Src/Utilities/Utilities.Core/Collections/StreamUtilities.cs
similarity index 96%
rename from Public/Src/Utilities/Collections/StreamUtilities.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/StreamUtilities.cs
index d8b7b8d8b..24135b7bf 100644
--- a/Public/Src/Utilities/Collections/StreamUtilities.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/StreamUtilities.cs
@@ -6,6 +6,8 @@ using System.Diagnostics.ContractsLight;
using System.IO;
using System.Threading.Tasks;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
///
diff --git a/Public/Src/Utilities/Collections/StructTuple.cs b/Public/Src/Utilities/Utilities.Core/Collections/StructTuple.cs
similarity index 97%
rename from Public/Src/Utilities/Collections/StructTuple.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/StructTuple.cs
index 0ce78341f..8ad414fbc 100644
--- a/Public/Src/Utilities/Collections/StructTuple.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/StructTuple.cs
@@ -7,6 +7,8 @@ using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.ContractsLight;
using System.Reflection;
+#nullable enable
+
namespace BuildXL.Utilities
{
///
diff --git a/Public/Src/Utilities/Collections/StructTupleExtensions.cs b/Public/Src/Utilities/Utilities.Core/Collections/StructTupleExtensions.cs
similarity index 100%
rename from Public/Src/Utilities/Collections/StructTupleExtensions.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/StructTupleExtensions.cs
diff --git a/Public/Src/Utilities/Collections/StructUtilities.cs b/Public/Src/Utilities/Utilities.Core/Collections/StructUtilities.cs
similarity index 96%
rename from Public/Src/Utilities/Collections/StructUtilities.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/StructUtilities.cs
index bdc093fb1..04deefbc9 100644
--- a/Public/Src/Utilities/Collections/StructUtilities.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/StructUtilities.cs
@@ -6,6 +6,8 @@ using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.ContractsLight;
using System.Runtime.CompilerServices;
+#nullable enable
+
namespace BuildXL.Utilities
{
///
diff --git a/Public/Src/Utilities/Collections/TypeInspector.cs b/Public/Src/Utilities/Utilities.Core/Collections/TypeInspector.cs
similarity index 97%
rename from Public/Src/Utilities/Collections/TypeInspector.cs
rename to Public/Src/Utilities/Utilities.Core/Collections/TypeInspector.cs
index d4890d88c..93ee16438 100644
--- a/Public/Src/Utilities/Collections/TypeInspector.cs
+++ b/Public/Src/Utilities/Utilities.Core/Collections/TypeInspector.cs
@@ -11,6 +11,8 @@ using System.Runtime.CompilerServices;
using System.Runtime.Serialization;
using System.Diagnostics.CodeAnalysis;
+#nullable enable
+
namespace BuildXL.Utilities.Collections
{
diff --git a/Public/Src/Utilities/Utilities/BuildXL.Utilities.dsc b/Public/Src/Utilities/Utilities/BuildXL.Utilities.dsc
index f6bcece8a..938815a46 100644
--- a/Public/Src/Utilities/Utilities/BuildXL.Utilities.dsc
+++ b/Public/Src/Utilities/Utilities/BuildXL.Utilities.dsc
@@ -18,7 +18,6 @@ export const dll = BuildXLSdk.library({
NetFx.System.Management.dll,
NetFx.System.Security.dll
),
- Collections.dll,
Interop.dll,
Utilities.Core.dll,