diff --git a/DotNetTry.sln b/DotNetTry.sln index 86b40e6b6..02caf3647 100644 --- a/DotNetTry.sln +++ b/DotNetTry.sln @@ -69,6 +69,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Interactiv EndProject Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.DotNet.Interactive.FSharp", "Microsoft.DotNet.Interactive.FSharp\Microsoft.DotNet.Interactive.FSharp.fsproj", "{12821999-9F44-486B-8EE3-38F0EFDFDA32}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MLS.Agent.Tools.Tests", "MLS.Agent.Tools.Tests\MLS.Agent.Tools.Tests.csproj", "{0F8F3C1A-F1D3-4476-9E5B-219BBAC8DBC6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -191,6 +193,10 @@ Global {90A9DF5F-CBEE-4B6B-8B58-BA94B0BDCF3C}.Debug|Any CPU.Build.0 = Debug|Any CPU {90A9DF5F-CBEE-4B6B-8B58-BA94B0BDCF3C}.Release|Any CPU.ActiveCfg = Release|Any CPU {90A9DF5F-CBEE-4B6B-8B58-BA94B0BDCF3C}.Release|Any CPU.Build.0 = Release|Any CPU + {11752CED-0F22-433D-B0B4-BA642C1BA613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11752CED-0F22-433D-B0B4-BA642C1BA613}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11752CED-0F22-433D-B0B4-BA642C1BA613}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11752CED-0F22-433D-B0B4-BA642C1BA613}.Release|Any CPU.Build.0 = Release|Any CPU {12821999-9F44-486B-8EE3-38F0EFDFDA32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {12821999-9F44-486B-8EE3-38F0EFDFDA32}.Debug|Any CPU.Build.0 = Debug|Any CPU {12821999-9F44-486B-8EE3-38F0EFDFDA32}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -199,6 +205,10 @@ Global {11752CED-0F22-433D-B0B4-BA642C1BA613}.Debug|Any CPU.Build.0 = Debug|Any CPU {11752CED-0F22-433D-B0B4-BA642C1BA613}.Release|Any CPU.ActiveCfg = Release|Any CPU {11752CED-0F22-433D-B0B4-BA642C1BA613}.Release|Any CPU.Build.0 = Release|Any CPU + {0F8F3C1A-F1D3-4476-9E5B-219BBAC8DBC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F8F3C1A-F1D3-4476-9E5B-219BBAC8DBC6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F8F3C1A-F1D3-4476-9E5B-219BBAC8DBC6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F8F3C1A-F1D3-4476-9E5B-219BBAC8DBC6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -233,8 +243,10 @@ Global {113A4166-5734-4F6E-B609-D6CF42679399} = {6EE8F484-DFA2-4F0F-939F-400CE78DFAC2} {2BB7CCD7-73D1-4B16-82EC-A5D0183F8CF5} = {6EE8F484-DFA2-4F0F-939F-400CE78DFAC2} {90A9DF5F-CBEE-4B6B-8B58-BA94B0BDCF3C} = {6EE8F484-DFA2-4F0F-939F-400CE78DFAC2} + {11752CED-0F22-433D-B0B4-BA642C1BA613} = {8192FEAD-BCE6-4E62-97E5-2E9EA884BD71} {12821999-9F44-486B-8EE3-38F0EFDFDA32} = {6EE8F484-DFA2-4F0F-939F-400CE78DFAC2} {11752CED-0F22-433D-B0B4-BA642C1BA613} = {8192FEAD-BCE6-4E62-97E5-2E9EA884BD71} + {0F8F3C1A-F1D3-4476-9E5B-219BBAC8DBC6} = {8192FEAD-BCE6-4E62-97E5-2E9EA884BD71} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D6CD99BA-B16B-4570-8910-225CBDFFA3AD} diff --git a/MLS.Agent.Tests/AgentService.cs b/MLS.Agent.Tests/AgentService.cs index 6fa83ce3a..56c88bf10 100644 --- a/MLS.Agent.Tests/AgentService.cs +++ b/MLS.Agent.Tests/AgentService.cs @@ -10,6 +10,7 @@ using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using MLS.Agent.CommandLine; +using MLS.Agent.Tools; using Pocket; using Recipes; using WorkspaceServer; diff --git a/MLS.Agent.Tests/ApiViaHttpTests.cs b/MLS.Agent.Tests/ApiViaHttpTests.cs index 562071470..00e6bb34c 100644 --- a/MLS.Agent.Tests/ApiViaHttpTests.cs +++ b/MLS.Agent.Tests/ApiViaHttpTests.cs @@ -27,10 +27,11 @@ using System.Web; using MLS.Agent.Controllers; using WorkspaceServer.Tests.Packaging; -using WorkspaceServer.Tests.TestUtility; using CodeManipulation = WorkspaceServer.Tests.CodeManipulation; using SourceFile = Microsoft.DotNet.Try.Protocol.ClientApi.SourceFile; using WorkspaceServer; +using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; namespace MLS.Agent.Tests { diff --git a/MLS.Agent.Tests/CommandLine/CommandLineParserTests.cs b/MLS.Agent.Tests/CommandLine/CommandLineParserTests.cs index 2c04c0eb4..0d89e1f2d 100644 --- a/MLS.Agent.Tests/CommandLine/CommandLineParserTests.cs +++ b/MLS.Agent.Tests/CommandLine/CommandLineParserTests.cs @@ -12,9 +12,9 @@ using Microsoft.Extensions.DependencyInjection; using MLS.Agent.CommandLine; using WorkspaceServer; -using WorkspaceServer.Tests.TestUtility; using Xunit; using Xunit.Abstractions; +using MLS.Agent.Tools; using WorkspaceServer.Tests; namespace MLS.Agent.Tests.CommandLine @@ -96,7 +96,7 @@ public async Task Parse_production_mode_flag_switches_option_to_production() [Fact] public async Task Parse_root_directory_with_a_valid_path_succeeds() { - var path = TestAssets.SampleConsole.FullName; + var path = Directory.GetCurrentDirectory(); await _parser.InvokeAsync(new[] { path }, _console); _startOptions.RootDirectory.GetFullyQualifiedRoot().FullName.Should().Be(path + Path.DirectorySeparatorChar); } diff --git a/MLS.Agent.Tests/CommandLine/StartupOptionsTests.cs b/MLS.Agent.Tests/CommandLine/StartupOptionsTests.cs index 03dae06fb..985b83bd4 100644 --- a/MLS.Agent.Tests/CommandLine/StartupOptionsTests.cs +++ b/MLS.Agent.Tests/CommandLine/StartupOptionsTests.cs @@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using MLS.Agent.CommandLine; +using MLS.Agent.Tools; using WorkspaceServer; using Xunit; diff --git a/MLS.Agent.Tests/CommandLine/VerifyCommandTests.cs b/MLS.Agent.Tests/CommandLine/VerifyCommandTests.cs index 89cb5279f..cb2728e46 100644 --- a/MLS.Agent.Tests/CommandLine/VerifyCommandTests.cs +++ b/MLS.Agent.Tests/CommandLine/VerifyCommandTests.cs @@ -8,6 +8,8 @@ using Microsoft.DotNet.Try.Markdown; using Microsoft.DotNet.Try.Protocol.Tests; using MLS.Agent.CommandLine; +using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; using WorkspaceServer; using WorkspaceServer.Tests; using Xunit; diff --git a/MLS.Agent.Tests/DocumentationAPITests.cs b/MLS.Agent.Tests/DocumentationAPITests.cs index 773e2f369..52e5cd39c 100644 --- a/MLS.Agent.Tests/DocumentationAPITests.cs +++ b/MLS.Agent.Tests/DocumentationAPITests.cs @@ -12,10 +12,11 @@ using HtmlAgilityPack; using Microsoft.DotNet.Try.Markdown; using MLS.Agent.CommandLine; +using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; using Recipes; using WorkspaceServer; using WorkspaceServer.Tests; -using WorkspaceServer.Tests.TestUtility; using Xunit; namespace MLS.Agent.Tests diff --git a/MLS.Agent.Tests/Markdown/CodeBlockAnnotationExtensionTests.cs b/MLS.Agent.Tests/Markdown/CodeBlockAnnotationExtensionTests.cs index 3b2105b6a..c64e8c48c 100644 --- a/MLS.Agent.Tests/Markdown/CodeBlockAnnotationExtensionTests.cs +++ b/MLS.Agent.Tests/Markdown/CodeBlockAnnotationExtensionTests.cs @@ -13,10 +13,10 @@ using MLS.Agent.Controllers; using MLS.Agent.Markdown; using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; using WorkspaceServer; using WorkspaceServer.Packaging; using WorkspaceServer.Tests; -using WorkspaceServer.Tests.TestUtility; using Xunit; namespace MLS.Agent.Tests.Markdown @@ -45,7 +45,6 @@ public CodeBlockAnnotationExtensionTests() [InlineData("C#")] public async Task Inserts_code_when_an_existing_file_is_specified_using_source_file_option(string language) { - var testDir = TestAssets.SampleConsole; var fileContent = @"using System; namespace BasicConsoleApp @@ -58,7 +57,7 @@ static void MyProgram(string[] args) } } }".EnforceLF(); - var directoryAccessor = new InMemoryDirectoryAccessor(testDir) + var directoryAccessor = new InMemoryDirectoryAccessor() { ("Program.cs", fileContent), ("sample.csproj", "") @@ -104,8 +103,7 @@ public async Task Does_not_insert_code_when_supported_language_is_specified_but_ ".EnforceLF(); - var testDir = TestAssets.SampleConsole; - var directoryAccessor = new InMemoryDirectoryAccessor(testDir); + var directoryAccessor = new InMemoryDirectoryAccessor(); var pipeline = new MarkdownPipelineBuilder().UseCodeBlockAnnotations(directoryAccessor,await Default.PackageRegistry.ValueAsync()).Build(); var document = $@" ```{fenceLanguage} @@ -119,8 +117,7 @@ public async Task Does_not_insert_code_when_supported_language_is_specified_but_ [Fact] public async Task Error_message_is_displayed_when_the_linked_file_does_not_exist() { - var testDir = TestAssets.SampleConsole; - var directoryAccessor = new InMemoryDirectoryAccessor(testDir) + var directoryAccessor = new InMemoryDirectoryAccessor() { ("sample.csproj", "") }; diff --git a/MLS.Agent.Tests/Markdown/MarkdownFileTests.cs b/MLS.Agent.Tests/Markdown/MarkdownFileTests.cs index 22be7564c..90721e07b 100644 --- a/MLS.Agent.Tests/Markdown/MarkdownFileTests.cs +++ b/MLS.Agent.Tests/Markdown/MarkdownFileTests.cs @@ -11,9 +11,10 @@ using MLS.Agent.CommandLine; using MLS.Agent.Markdown; using WorkspaceServer.Tests; -using WorkspaceServer.Tests.TestUtility; using Xunit; using Xunit.Abstractions; +using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; namespace MLS.Agent.Tests.Markdown { @@ -123,10 +124,9 @@ static void MyProgram(string[] args) [Fact] public async Task Should_parse_markdown_file_and_set_package_with_fully_resolved_path() { - var workingDir = TestAssets.SampleConsole; var packagePathRelativeToBaseDir = "src/sample/sample.csproj"; - var dirAccessor = new InMemoryDirectoryAccessor(workingDir) + var dirAccessor = new InMemoryDirectoryAccessor() { ("src/sample/Program.cs", ""), (packagePathRelativeToBaseDir, ""), diff --git a/MLS.Agent.Tests/Markdown/MarkdownProjectTests.cs b/MLS.Agent.Tests/Markdown/MarkdownProjectTests.cs index d5cb6141f..5eaacf09e 100644 --- a/MLS.Agent.Tests/Markdown/MarkdownProjectTests.cs +++ b/MLS.Agent.Tests/Markdown/MarkdownProjectTests.cs @@ -10,7 +10,8 @@ using Microsoft.DotNet.Try.Markdown; using MLS.Agent.Markdown; using WorkspaceServer.Tests; -using WorkspaceServer.Tests.TestUtility; +using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; namespace MLS.Agent.Tests { @@ -21,8 +22,7 @@ public class GetAllMarkdownFiles [Fact] public async Task Returns_list_of_all_relative_paths_to_all_markdown_files() { - var workingDir = TestAssets.SampleConsole; - var dirAccessor = new InMemoryDirectoryAccessor(workingDir) + var dirAccessor = new InMemoryDirectoryAccessor() { ("Readme.md", ""), ("Subdirectory/Tutorial.md", ""), diff --git a/MLS.Agent.Tests/WorkspaceDiscoveryTests.cs b/MLS.Agent.Tests/WorkspaceDiscoveryTests.cs index ae28d2bf4..20c7ed810 100644 --- a/MLS.Agent.Tests/WorkspaceDiscoveryTests.cs +++ b/MLS.Agent.Tests/WorkspaceDiscoveryTests.cs @@ -18,6 +18,7 @@ using Buffer = Microsoft.DotNet.Try.Protocol.Buffer; using File = Microsoft.DotNet.Try.Protocol.File; using WorkspaceServer; +using MLS.Agent.Tools; namespace MLS.Agent.Tests { diff --git a/MLS.Agent.Tests/Markdown/DirectoryAccessorTests.cs b/MLS.Agent.Tools.Tests/DirectoryAccessorTests.cs similarity index 98% rename from MLS.Agent.Tests/Markdown/DirectoryAccessorTests.cs rename to MLS.Agent.Tools.Tests/DirectoryAccessorTests.cs index 128ff70e4..2bdd6d418 100644 --- a/MLS.Agent.Tests/Markdown/DirectoryAccessorTests.cs +++ b/MLS.Agent.Tools.Tests/DirectoryAccessorTests.cs @@ -6,12 +6,8 @@ using System.Runtime.CompilerServices; using FluentAssertions; using Microsoft.DotNet.PlatformAbstractions; -using Microsoft.DotNet.Try.Markdown; -using WorkspaceServer; -using WorkspaceServer.Packaging; -using WorkspaceServer.Tests; -using WorkspaceServer.Tests.Packaging; -using WorkspaceServer.Tests.TestUtility; +using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; using Xunit; using static Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment; diff --git a/WorkspaceServer.Tests/InMemoryDirectoryAccessor.cs b/MLS.Agent.Tools.Tests/InMemoryDirectoryAccessor.cs similarity index 98% rename from WorkspaceServer.Tests/InMemoryDirectoryAccessor.cs rename to MLS.Agent.Tools.Tests/InMemoryDirectoryAccessor.cs index 41836df8c..36f15874a 100644 --- a/WorkspaceServer.Tests/InMemoryDirectoryAccessor.cs +++ b/MLS.Agent.Tools.Tests/InMemoryDirectoryAccessor.cs @@ -6,10 +6,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Threading.Tasks; -using Microsoft.DotNet.Try.Markdown; -namespace WorkspaceServer.Tests +namespace MLS.Agent.Tools.Tests { public class InMemoryDirectoryAccessor : IDirectoryAccessor, IEnumerable { diff --git a/MLS.Agent.Tools.Tests/MLS.Agent.Tools.Tests.csproj b/MLS.Agent.Tools.Tests/MLS.Agent.Tools.Tests.csproj new file mode 100644 index 000000000..f24dc7a6f --- /dev/null +++ b/MLS.Agent.Tools.Tests/MLS.Agent.Tools.Tests.csproj @@ -0,0 +1,31 @@ + + + + netcoreapp3.0 + portable-net45+win8+wp8+wpa81 + $(NoWarn);8002 + + + + + + + + + + + + Always + + + + + + + + + + + + + diff --git a/WorkspaceServer.Tests/Packaging/PackageUtilities.cs b/MLS.Agent.Tools.Tests/PackageUtilities.cs similarity index 97% rename from WorkspaceServer.Tests/Packaging/PackageUtilities.cs rename to MLS.Agent.Tools.Tests/PackageUtilities.cs index a68adbd02..6de7f7577 100644 --- a/WorkspaceServer.Tests/Packaging/PackageUtilities.cs +++ b/MLS.Agent.Tools.Tests/PackageUtilities.cs @@ -6,10 +6,9 @@ using System.Reactive.Concurrency; using System.Threading.Tasks; using Clockwise; -using MLS.Agent.Tools; using WorkspaceServer.Packaging; -namespace WorkspaceServer.Tests.Packaging +namespace MLS.Agent.Tools.Tests { public static class PackageUtilities { diff --git a/Microsoft.DotNet.Try.Markdown.Tests/RelativeDirectoryPathTests.cs b/MLS.Agent.Tools.Tests/RelativeDirectoryPathTests.cs similarity index 97% rename from Microsoft.DotNet.Try.Markdown.Tests/RelativeDirectoryPathTests.cs rename to MLS.Agent.Tools.Tests/RelativeDirectoryPathTests.cs index 6c6e5863f..40be0ce6e 100644 --- a/Microsoft.DotNet.Try.Markdown.Tests/RelativeDirectoryPathTests.cs +++ b/MLS.Agent.Tools.Tests/RelativeDirectoryPathTests.cs @@ -3,9 +3,10 @@ using System; using FluentAssertions; +using MLS.Agent.Tools; using Xunit; -namespace Microsoft.DotNet.Try.Markdown.Tests +namespace MLS.Agent.Tools.Tests { public class RelativeDirectoryPathTests { diff --git a/Microsoft.DotNet.Try.Markdown.Tests/RelativeFilePathTests.cs b/MLS.Agent.Tools.Tests/RelativeFilePathTests.cs similarity index 98% rename from Microsoft.DotNet.Try.Markdown.Tests/RelativeFilePathTests.cs rename to MLS.Agent.Tools.Tests/RelativeFilePathTests.cs index 31ebff44e..be0b2854e 100644 --- a/Microsoft.DotNet.Try.Markdown.Tests/RelativeFilePathTests.cs +++ b/MLS.Agent.Tools.Tests/RelativeFilePathTests.cs @@ -3,10 +3,11 @@ using System; using FluentAssertions; +using MLS.Agent.Tools; using Xunit; using Xunit.Abstractions; -namespace Microsoft.DotNet.Try.Markdown.Tests +namespace MLS.Agent.Tools.Tests { public class RelativeFilePathTests { diff --git a/WorkspaceServer.Tests/TestProjects/SampleConsole/BasicConsoleApp.csproj b/MLS.Agent.Tools.Tests/TestProjects/SampleConsole/BasicConsoleApp.csproj similarity index 100% rename from WorkspaceServer.Tests/TestProjects/SampleConsole/BasicConsoleApp.csproj rename to MLS.Agent.Tools.Tests/TestProjects/SampleConsole/BasicConsoleApp.csproj diff --git a/WorkspaceServer.Tests/TestProjects/SampleConsole/Program.cs b/MLS.Agent.Tools.Tests/TestProjects/SampleConsole/Program.cs similarity index 100% rename from WorkspaceServer.Tests/TestProjects/SampleConsole/Program.cs rename to MLS.Agent.Tools.Tests/TestProjects/SampleConsole/Program.cs diff --git a/WorkspaceServer.Tests/TestProjects/SampleConsole/Readme.md b/MLS.Agent.Tools.Tests/TestProjects/SampleConsole/Readme.md similarity index 100% rename from WorkspaceServer.Tests/TestProjects/SampleConsole/Readme.md rename to MLS.Agent.Tools.Tests/TestProjects/SampleConsole/Readme.md diff --git a/WorkspaceServer.Tests/TestProjects/SampleConsole/Subdirectory/AnotherProgram.cs b/MLS.Agent.Tools.Tests/TestProjects/SampleConsole/Subdirectory/AnotherProgram.cs similarity index 100% rename from WorkspaceServer.Tests/TestProjects/SampleConsole/Subdirectory/AnotherProgram.cs rename to MLS.Agent.Tools.Tests/TestProjects/SampleConsole/Subdirectory/AnotherProgram.cs diff --git a/WorkspaceServer.Tests/TestProjects/SampleConsole/Subdirectory/Tutorial.md b/MLS.Agent.Tools.Tests/TestProjects/SampleConsole/Subdirectory/Tutorial.md similarity index 100% rename from WorkspaceServer.Tests/TestProjects/SampleConsole/Subdirectory/Tutorial.md rename to MLS.Agent.Tools.Tests/TestProjects/SampleConsole/Subdirectory/Tutorial.md diff --git a/WorkspaceServer.Tests/TestUtility/TestAssets.cs b/MLS.Agent.Tools.Tests/TestUtility/TestAssets.cs similarity index 94% rename from WorkspaceServer.Tests/TestUtility/TestAssets.cs rename to MLS.Agent.Tools.Tests/TestUtility/TestAssets.cs index c265fd9e5..8c84cd6eb 100644 --- a/WorkspaceServer.Tests/TestUtility/TestAssets.cs +++ b/MLS.Agent.Tools.Tests/TestUtility/TestAssets.cs @@ -3,7 +3,7 @@ using System.IO; -namespace WorkspaceServer.Tests.TestUtility +namespace MLS.Agent.Tools.Tests { public static class TestAssets { diff --git a/WorkspaceServer/DirectoryAccessor.cs b/MLS.Agent.Tools/DirectoryAccessor.cs similarity index 96% rename from WorkspaceServer/DirectoryAccessor.cs rename to MLS.Agent.Tools/DirectoryAccessor.cs index e93241900..6259fbcdb 100644 --- a/WorkspaceServer/DirectoryAccessor.cs +++ b/MLS.Agent.Tools/DirectoryAccessor.cs @@ -1,11 +1,10 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools.Roslyn; using System.IO; -using Microsoft.DotNet.Try.Markdown; -using WorkspaceServer.Servers.Roslyn; -namespace WorkspaceServer +namespace MLS.Agent.Tools { public static class DirectoryAccessor { diff --git a/WorkspaceServer/Servers/Roslyn/FileNameUtilities.cs b/MLS.Agent.Tools/FileNameUtilities.cs similarity index 99% rename from WorkspaceServer/Servers/Roslyn/FileNameUtilities.cs rename to MLS.Agent.Tools/FileNameUtilities.cs index dc253d7b3..70bf4a3f4 100644 --- a/WorkspaceServer/Servers/Roslyn/FileNameUtilities.cs +++ b/MLS.Agent.Tools/FileNameUtilities.cs @@ -1,6 +1,6 @@ // adpated from http://source.roslyn.io/#Microsoft.CodeAnalysis/InternalUtilities/FileNameUtilities.cs,c5e9631691356ed7 -namespace WorkspaceServer.Servers.Roslyn +namespace MLS.Agent.Tools { /// /// Implements a few file name utilities that are needed by the compiler. diff --git a/WorkspaceServer/FileSystemDirectoryAccessor.cs b/MLS.Agent.Tools/FileSystemDirectoryAccessor.cs similarity index 96% rename from WorkspaceServer/FileSystemDirectoryAccessor.cs rename to MLS.Agent.Tools/FileSystemDirectoryAccessor.cs index e9678d016..20d53ba45 100644 --- a/WorkspaceServer/FileSystemDirectoryAccessor.cs +++ b/MLS.Agent.Tools/FileSystemDirectoryAccessor.cs @@ -1,17 +1,15 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools.Roslyn; using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.DotNet.Try.Markdown; -using WorkspaceServer.Packaging; -using WorkspaceServer.Servers.Roslyn; -namespace WorkspaceServer +namespace MLS.Agent.Tools { public class FileSystemDirectoryAccessor : IDirectoryAccessor { diff --git a/WorkspaceServer/IDirectoryAccessor.cs b/MLS.Agent.Tools/IDirectoryAccessor.cs similarity index 93% rename from WorkspaceServer/IDirectoryAccessor.cs rename to MLS.Agent.Tools/IDirectoryAccessor.cs index f0bfe7ef4..3ffbe3652 100644 --- a/WorkspaceServer/IDirectoryAccessor.cs +++ b/MLS.Agent.Tools/IDirectoryAccessor.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.IO; -using Microsoft.DotNet.Try.Markdown; -namespace WorkspaceServer +namespace MLS.Agent.Tools { public interface IDirectoryAccessor { diff --git a/MLS.Agent.Tools/MLS.Agent.Tools.csproj b/MLS.Agent.Tools/MLS.Agent.Tools.csproj index 5a6761c3d..5d3e9e248 100644 --- a/MLS.Agent.Tools/MLS.Agent.Tools.csproj +++ b/MLS.Agent.Tools/MLS.Agent.Tools.csproj @@ -35,5 +35,4 @@ - diff --git a/WorkspaceServer/Servers/Roslyn/PathUtilities.cs b/MLS.Agent.Tools/PathUtilities.cs similarity index 99% rename from WorkspaceServer/Servers/Roslyn/PathUtilities.cs rename to MLS.Agent.Tools/PathUtilities.cs index 61155d8bf..50e8bc0b5 100644 --- a/WorkspaceServer/Servers/Roslyn/PathUtilities.cs +++ b/MLS.Agent.Tools/PathUtilities.cs @@ -11,7 +11,7 @@ // adapted from http://source.roslyn.io/#System.Reflection.Metadata/System/Reflection/Internal/Utilities/PathUtilities.cs,36b27d7696df4d1e -namespace WorkspaceServer.Servers.Roslyn +namespace MLS.Agent.Tools.Roslyn { // Contains path parsing utilities. // We need our own because System.IO.Path is insufficient for our purposes diff --git a/Microsoft.DotNet.Try.Markdown/RelativeDirectoryPath.cs b/MLS.Agent.Tools/RelativeDirectoryPath.cs similarity index 97% rename from Microsoft.DotNet.Try.Markdown/RelativeDirectoryPath.cs rename to MLS.Agent.Tools/RelativeDirectoryPath.cs index 9c143c909..a31adf63f 100644 --- a/Microsoft.DotNet.Try.Markdown/RelativeDirectoryPath.cs +++ b/MLS.Agent.Tools/RelativeDirectoryPath.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.DotNet.Try.Markdown +namespace MLS.Agent.Tools { public class RelativeDirectoryPath : RelativePath, diff --git a/Microsoft.DotNet.Try.Markdown/RelativeFilePath.cs b/MLS.Agent.Tools/RelativeFilePath.cs similarity index 98% rename from Microsoft.DotNet.Try.Markdown/RelativeFilePath.cs rename to MLS.Agent.Tools/RelativeFilePath.cs index 058547a8b..d07a2cb64 100644 --- a/Microsoft.DotNet.Try.Markdown/RelativeFilePath.cs +++ b/MLS.Agent.Tools/RelativeFilePath.cs @@ -4,8 +4,8 @@ using System; using System.IO; -namespace Microsoft.DotNet.Try.Markdown -{ +namespace MLS.Agent.Tools +{ public class RelativeFilePath : RelativePath, IEquatable diff --git a/Microsoft.DotNet.Try.Markdown/RelativePath.cs b/MLS.Agent.Tools/RelativePath.cs similarity index 99% rename from Microsoft.DotNet.Try.Markdown/RelativePath.cs rename to MLS.Agent.Tools/RelativePath.cs index 37e98d236..239fee6e6 100644 --- a/Microsoft.DotNet.Try.Markdown/RelativePath.cs +++ b/MLS.Agent.Tools/RelativePath.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.IO; -namespace Microsoft.DotNet.Try.Markdown +namespace MLS.Agent.Tools { public abstract class RelativePath { diff --git a/Microsoft.DotNet.Try.Markdown/RelativePathExtensions.cs b/MLS.Agent.Tools/RelativePathExtensions.cs similarity index 96% rename from Microsoft.DotNet.Try.Markdown/RelativePathExtensions.cs rename to MLS.Agent.Tools/RelativePathExtensions.cs index bc8bd60bb..db426c10c 100644 --- a/Microsoft.DotNet.Try.Markdown/RelativePathExtensions.cs +++ b/MLS.Agent.Tools/RelativePathExtensions.cs @@ -3,7 +3,7 @@ using System.IO; -namespace Microsoft.DotNet.Try.Markdown +namespace MLS.Agent.Tools { public static class RelativePathExtensions { diff --git a/MLS.Agent/CommandLine/CommandLineParser.cs b/MLS.Agent/CommandLine/CommandLineParser.cs index cf2db2093..46489f77c 100644 --- a/MLS.Agent/CommandLine/CommandLineParser.cs +++ b/MLS.Agent/CommandLine/CommandLineParser.cs @@ -16,6 +16,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using MLS.Agent.Markdown; +using MLS.Agent.Tools; using MLS.Repositories; using WorkspaceServer; using WorkspaceServer.Kernel; diff --git a/MLS.Agent/CommandLine/DemoCommand.cs b/MLS.Agent/CommandLine/DemoCommand.cs index c4f5c6995..84b53ec67 100644 --- a/MLS.Agent/CommandLine/DemoCommand.cs +++ b/MLS.Agent/CommandLine/DemoCommand.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools; using System; using System.CommandLine; using System.CommandLine.Invocation; diff --git a/MLS.Agent/CommandLine/StartupOptions.cs b/MLS.Agent/CommandLine/StartupOptions.cs index 556117101..aa2d116c2 100644 --- a/MLS.Agent/CommandLine/StartupOptions.cs +++ b/MLS.Agent/CommandLine/StartupOptions.cs @@ -8,6 +8,7 @@ using Microsoft.DotNet.Try.Markdown; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using MLS.Agent.Tools; using WorkspaceServer; namespace MLS.Agent.CommandLine diff --git a/MLS.Agent/CommandLine/VerifyCommand.cs b/MLS.Agent/CommandLine/VerifyCommand.cs index 987a439f0..4f695e514 100644 --- a/MLS.Agent/CommandLine/VerifyCommand.cs +++ b/MLS.Agent/CommandLine/VerifyCommand.cs @@ -15,6 +15,7 @@ using WorkspaceServer.Servers; using Buffer = Microsoft.DotNet.Try.Protocol.Buffer; using File = Microsoft.DotNet.Try.Protocol.File; +using MLS.Agent.Tools; namespace MLS.Agent.CommandLine { diff --git a/MLS.Agent/CommandLine/VerifyOptions.cs b/MLS.Agent/CommandLine/VerifyOptions.cs index 4b36c756a..a252f256e 100644 --- a/MLS.Agent/CommandLine/VerifyOptions.cs +++ b/MLS.Agent/CommandLine/VerifyOptions.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools; using System.IO; using WorkspaceServer; diff --git a/MLS.Agent/Controllers/DocumentationController.cs b/MLS.Agent/Controllers/DocumentationController.cs index 7bc14be8d..443550f58 100644 --- a/MLS.Agent/Controllers/DocumentationController.cs +++ b/MLS.Agent/Controllers/DocumentationController.cs @@ -12,6 +12,7 @@ using Microsoft.DotNet.Try.Markdown; using MLS.Agent.CommandLine; using MLS.Agent.Markdown; +using MLS.Agent.Tools; using Recipes; using WorkspaceServer; using WorkspaceServer.Packaging; diff --git a/MLS.Agent/Controllers/WebAssemblyController.cs b/MLS.Agent/Controllers/WebAssemblyController.cs index c1b59b121..80e8b6786 100644 --- a/MLS.Agent/Controllers/WebAssemblyController.cs +++ b/MLS.Agent/Controllers/WebAssemblyController.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.DotNet.Try.Markdown; using MLS.Agent.CommandLine; +using MLS.Agent.Tools; using WorkspaceServer; using WorkspaceServer.Packaging; diff --git a/MLS.Agent/Markdown/AnnotatedCodeBlockExtensions.cs b/MLS.Agent/Markdown/AnnotatedCodeBlockExtensions.cs index beecc33d8..e89c435b1 100644 --- a/MLS.Agent/Markdown/AnnotatedCodeBlockExtensions.cs +++ b/MLS.Agent/Markdown/AnnotatedCodeBlockExtensions.cs @@ -3,6 +3,7 @@ using Microsoft.DotNet.Try.Markdown; using Microsoft.DotNet.Try.Protocol; +using MLS.Agent.Tools; using WorkspaceServer; namespace MLS.Agent.Markdown diff --git a/MLS.Agent/Markdown/LocalCodeBlockAnnotations.cs b/MLS.Agent/Markdown/LocalCodeBlockAnnotations.cs index 7bfbb555a..368bcfba5 100644 --- a/MLS.Agent/Markdown/LocalCodeBlockAnnotations.cs +++ b/MLS.Agent/Markdown/LocalCodeBlockAnnotations.cs @@ -10,6 +10,7 @@ using Microsoft.CodeAnalysis.Text; using Microsoft.DotNet.Try.Markdown; using Microsoft.DotNet.Try.Project; +using MLS.Agent.Tools; using WorkspaceServer; using WorkspaceServer.Packaging; diff --git a/MLS.Agent/Markdown/LocalCodeFenceAnnotationsParser.cs b/MLS.Agent/Markdown/LocalCodeFenceAnnotationsParser.cs index c3366eff2..5564cc800 100644 --- a/MLS.Agent/Markdown/LocalCodeFenceAnnotationsParser.cs +++ b/MLS.Agent/Markdown/LocalCodeFenceAnnotationsParser.cs @@ -8,6 +8,7 @@ using System.Linq; using Markdig; using Microsoft.DotNet.Try.Markdown; +using MLS.Agent.Tools; using WorkspaceServer; namespace MLS.Agent.Markdown diff --git a/MLS.Agent/Markdown/MarkdownFile.cs b/MLS.Agent/Markdown/MarkdownFile.cs index 3c630f9de..359416b46 100644 --- a/MLS.Agent/Markdown/MarkdownFile.cs +++ b/MLS.Agent/Markdown/MarkdownFile.cs @@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Html; using Microsoft.DotNet.Try.Markdown; using Microsoft.DotNet.Try.Protocol; +using MLS.Agent.Tools; using WorkspaceServer; using Buffer = Microsoft.DotNet.Try.Protocol.Buffer; diff --git a/MLS.Agent/Markdown/MarkdownPipelineBuilderExtensions.cs b/MLS.Agent/Markdown/MarkdownPipelineBuilderExtensions.cs index 71c431092..bf019a2e4 100644 --- a/MLS.Agent/Markdown/MarkdownPipelineBuilderExtensions.cs +++ b/MLS.Agent/Markdown/MarkdownPipelineBuilderExtensions.cs @@ -3,6 +3,7 @@ using Markdig; using Microsoft.DotNet.Try.Markdown; +using MLS.Agent.Tools; using WorkspaceServer; namespace MLS.Agent.Markdown diff --git a/MLS.Agent/Markdown/MarkdownProject.cs b/MLS.Agent/Markdown/MarkdownProject.cs index 74c0b16e9..595608ed9 100644 --- a/MLS.Agent/Markdown/MarkdownProject.cs +++ b/MLS.Agent/Markdown/MarkdownProject.cs @@ -10,6 +10,7 @@ using Markdig; using Markdig.Extensions.Mathematics; using Microsoft.DotNet.Try.Markdown; +using MLS.Agent.Tools; using Recipes; using WorkspaceServer; diff --git a/MLS.Agent/Startup.cs b/MLS.Agent/Startup.cs index 76086c175..e8316ec45 100644 --- a/MLS.Agent/Startup.cs +++ b/MLS.Agent/Startup.cs @@ -20,6 +20,7 @@ using MLS.Agent.CommandLine; using MLS.Agent.Markdown; using MLS.Agent.Middleware; +using MLS.Agent.Tools; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using Pocket; diff --git a/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj b/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj index 159efe7dd..b4eed797e 100644 --- a/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj +++ b/Microsoft.DotNet.Interactive/Microsoft.DotNet.Interactive.csproj @@ -16,6 +16,7 @@ + diff --git a/Microsoft.DotNet.Try.Markdown.Tests/Microsoft.DotNet.Try.Markdown.Tests.csproj b/Microsoft.DotNet.Try.Markdown.Tests/Microsoft.DotNet.Try.Markdown.Tests.csproj index 8c4af97a6..c7342041c 100644 --- a/Microsoft.DotNet.Try.Markdown.Tests/Microsoft.DotNet.Try.Markdown.Tests.csproj +++ b/Microsoft.DotNet.Try.Markdown.Tests/Microsoft.DotNet.Try.Markdown.Tests.csproj @@ -22,6 +22,7 @@ + diff --git a/Microsoft.DotNet.Try.Markdown/CodeBlockAnnotations.cs b/Microsoft.DotNet.Try.Markdown/CodeBlockAnnotations.cs index 8163fd4c4..7f5027a21 100644 --- a/Microsoft.DotNet.Try.Markdown/CodeBlockAnnotations.cs +++ b/Microsoft.DotNet.Try.Markdown/CodeBlockAnnotations.cs @@ -7,6 +7,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml; +using MLS.Agent.Tools; namespace Microsoft.DotNet.Try.Markdown { diff --git a/Microsoft.DotNet.Try.Markdown/CodeFenceAnnotationsParser.cs b/Microsoft.DotNet.Try.Markdown/CodeFenceAnnotationsParser.cs index eb3363eda..fe9544d83 100644 --- a/Microsoft.DotNet.Try.Markdown/CodeFenceAnnotationsParser.cs +++ b/Microsoft.DotNet.Try.Markdown/CodeFenceAnnotationsParser.cs @@ -7,6 +7,7 @@ using System.CommandLine.Binding; using System.Linq; using Markdig; +using MLS.Agent.Tools; namespace Microsoft.DotNet.Try.Markdown { diff --git a/Microsoft.DotNet.Try.Markdown/Microsoft.DotNet.Try.Markdown.csproj b/Microsoft.DotNet.Try.Markdown/Microsoft.DotNet.Try.Markdown.csproj index 30d8b0faa..a100f5cb4 100644 --- a/Microsoft.DotNet.Try.Markdown/Microsoft.DotNet.Try.Markdown.csproj +++ b/Microsoft.DotNet.Try.Markdown/Microsoft.DotNet.Try.Markdown.csproj @@ -16,4 +16,8 @@ + + + + diff --git a/WorkspaceServer.Tests/Create.cs b/WorkspaceServer.Tests/Create.cs index 180840d0b..cacabbc8f 100644 --- a/WorkspaceServer.Tests/Create.cs +++ b/WorkspaceServer.Tests/Create.cs @@ -13,6 +13,8 @@ using Microsoft.DotNet.Try.Protocol; using Microsoft.DotNet.Try.Protocol.Tests; using MLS.Agent.CommandLine; +using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; using Recipes; using WorkspaceServer.Packaging; using WorkspaceServer.Tests.Packaging; diff --git a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs index cda673e33..320542879 100644 --- a/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs +++ b/WorkspaceServer.Tests/Kernel/CSharpKernelTests.cs @@ -13,6 +13,7 @@ using Microsoft.DotNet.Interactive.Commands; using Microsoft.DotNet.Interactive.Events; using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; using Newtonsoft.Json; using Recipes; using WorkspaceServer.Kernel; diff --git a/WorkspaceServer.Tests/PackageRegistryTests.cs b/WorkspaceServer.Tests/PackageRegistryTests.cs index 49a8f8c42..ec698d76b 100644 --- a/WorkspaceServer.Tests/PackageRegistryTests.cs +++ b/WorkspaceServer.Tests/PackageRegistryTests.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using FluentAssertions; +using MLS.Agent.Tools.Tests; using WorkspaceServer.Packaging; using WorkspaceServer.Tests.Packaging; using Xunit; diff --git a/WorkspaceServer.Tests/PackageTests.cs b/WorkspaceServer.Tests/PackageTests.cs index 9db85c8b4..45bbd9bed 100644 --- a/WorkspaceServer.Tests/PackageTests.cs +++ b/WorkspaceServer.Tests/PackageTests.cs @@ -14,6 +14,7 @@ using WorkspaceServer.Packaging; using System.Threading; using WorkspaceServer.Tests.Packaging; +using MLS.Agent.Tools.Tests; namespace WorkspaceServer.Tests { diff --git a/WorkspaceServer.Tests/PackageTests2.cs b/WorkspaceServer.Tests/PackageTests2.cs index 38a192ce1..ea0d1ad2b 100644 --- a/WorkspaceServer.Tests/PackageTests2.cs +++ b/WorkspaceServer.Tests/PackageTests2.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using FluentAssertions; using MLS.Agent.Tools; +using MLS.Agent.Tools.Tests; using WorkspaceServer.Packaging; using WorkspaceServer.Tests.Packaging; using Xunit; diff --git a/WorkspaceServer.Tests/Packaging/FakeToolPackageLocator.cs b/WorkspaceServer.Tests/Packaging/FakeToolPackageLocator.cs index 2e909de44..7b858b2e6 100644 --- a/WorkspaceServer.Tests/Packaging/FakeToolPackageLocator.cs +++ b/WorkspaceServer.Tests/Packaging/FakeToolPackageLocator.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Clockwise; +using MLS.Agent.Tools.Tests; using WorkspaceServer.Packaging; using WorkspaceServer.WorkspaceFeatures; diff --git a/WorkspaceServer.Tests/PrebuiltBlazorPackageLocatorTests.cs b/WorkspaceServer.Tests/PrebuiltBlazorPackageLocatorTests.cs index a84128d25..dd4fc18ef 100644 --- a/WorkspaceServer.Tests/PrebuiltBlazorPackageLocatorTests.cs +++ b/WorkspaceServer.Tests/PrebuiltBlazorPackageLocatorTests.cs @@ -32,7 +32,7 @@ public async Task Discovers_built_blazor_package() var locator = new PrebuiltBlazorPackageLocator(); var asset = await locator.Locate(packageName); - asset.DirectoryAccessor.FileExists("index.html").Should().Be(true); + asset.DirectoryAccessor.FileExists(new MLS.Agent.Tools.RelativeFilePath("index.html")).Should().Be(true); } public void Dispose() diff --git a/WorkspaceServer.Tests/RoslynWorkspaceServerTestsConsoleProjectIntellisenseTests.cs b/WorkspaceServer.Tests/RoslynWorkspaceServerTestsConsoleProjectIntellisenseTests.cs index a22186268..8305a0760 100644 --- a/WorkspaceServer.Tests/RoslynWorkspaceServerTestsConsoleProjectIntellisenseTests.cs +++ b/WorkspaceServer.Tests/RoslynWorkspaceServerTestsConsoleProjectIntellisenseTests.cs @@ -6,6 +6,7 @@ using FluentAssertions; using Microsoft.DotNet.Try.Protocol; using Microsoft.DotNet.Try.Protocol.Tests; +using MLS.Agent.Tools.Tests; using WorkspaceServer.Tests.Packaging; using Xunit; using Xunit.Abstractions; diff --git a/WorkspaceServer.Tests/WebServerTests.cs b/WorkspaceServer.Tests/WebServerTests.cs index 9405a04b3..b7fee7e3c 100644 --- a/WorkspaceServer.Tests/WebServerTests.cs +++ b/WorkspaceServer.Tests/WebServerTests.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using FluentAssertions; +using MLS.Agent.Tools.Tests; using Pocket; using Recipes; using WorkspaceServer.Features; diff --git a/WorkspaceServer.Tests/WorkspaceServer.Tests.csproj b/WorkspaceServer.Tests/WorkspaceServer.Tests.csproj index ebf135de8..e0f99cf8d 100644 --- a/WorkspaceServer.Tests/WorkspaceServer.Tests.csproj +++ b/WorkspaceServer.Tests/WorkspaceServer.Tests.csproj @@ -67,6 +67,7 @@ + diff --git a/WorkspaceServer.Tests/WorkspaceServerRegistryTests.cs b/WorkspaceServer.Tests/WorkspaceServerRegistryTests.cs index 9e5f8b8d0..452f96bb1 100644 --- a/WorkspaceServer.Tests/WorkspaceServerRegistryTests.cs +++ b/WorkspaceServer.Tests/WorkspaceServerRegistryTests.cs @@ -14,6 +14,7 @@ using FluentAssertions.Extensions; using WorkspaceServer.Packaging; using WorkspaceServer.Tests.Packaging; +using MLS.Agent.Tools.Tests; namespace WorkspaceServer.Tests { diff --git a/WorkspaceServer/DirectoryAccessExtensions.cs b/WorkspaceServer/DirectoryAccessExtensions.cs index a9648a38e..ec3581220 100644 --- a/WorkspaceServer/DirectoryAccessExtensions.cs +++ b/WorkspaceServer/DirectoryAccessExtensions.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools; using System; using System.Threading.Tasks; using WorkspaceServer.Packaging; diff --git a/WorkspaceServer/FindPackageInDefaultLocation.cs b/WorkspaceServer/FindPackageInDefaultLocation.cs index 7f3ab3ba4..c51e218d8 100644 --- a/WorkspaceServer/FindPackageInDefaultLocation.cs +++ b/WorkspaceServer/FindPackageInDefaultLocation.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools; using System.Threading.Tasks; using WorkspaceServer.Packaging; diff --git a/WorkspaceServer/PackageNameIsFullyQualifiedPath.cs b/WorkspaceServer/PackageNameIsFullyQualifiedPath.cs index 9c96cbc89..d2f413ab1 100644 --- a/WorkspaceServer/PackageNameIsFullyQualifiedPath.cs +++ b/WorkspaceServer/PackageNameIsFullyQualifiedPath.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools; using System.IO; using System.Threading.Tasks; using WorkspaceServer.Packaging; diff --git a/WorkspaceServer/PackageRegistry.cs b/WorkspaceServer/PackageRegistry.cs index ea3e7d810..faee915d5 100644 --- a/WorkspaceServer/PackageRegistry.cs +++ b/WorkspaceServer/PackageRegistry.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Threading.Tasks; using Clockwise; +using MLS.Agent.Tools; using WorkspaceServer.Packaging; namespace WorkspaceServer diff --git a/WorkspaceServer/Packaging/CommandLineProject.cs b/WorkspaceServer/Packaging/CommandLineProject.cs index 890e7c17d..3c43f2a44 100644 --- a/WorkspaceServer/Packaging/CommandLineProject.cs +++ b/WorkspaceServer/Packaging/CommandLineProject.cs @@ -7,6 +7,8 @@ using System.Linq; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Host.Mef; +using MLS.Agent.Tools; +using MLS.Agent.Tools.Roslyn; using WorkspaceServer.Servers.Roslyn; // adapted from https://github.com/dotnet/roslyn/blob/master/src/Workspaces/Core/Desktop/Workspace/CommandLineProject.cs diff --git a/WorkspaceServer/Packaging/FileLock.cs b/WorkspaceServer/Packaging/FileLock.cs index 9e865d405..c050741bb 100644 --- a/WorkspaceServer/Packaging/FileLock.cs +++ b/WorkspaceServer/Packaging/FileLock.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools; using System; using System.IO; using System.Threading.Tasks; diff --git a/WorkspaceServer/Packaging/IPackage.cs b/WorkspaceServer/Packaging/IPackage.cs index 499a56a84..c405c0458 100644 --- a/WorkspaceServer/Packaging/IPackage.cs +++ b/WorkspaceServer/Packaging/IPackage.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using Clockwise; using Microsoft.CodeAnalysis; +using MLS.Agent.Tools; namespace WorkspaceServer.Packaging { diff --git a/WorkspaceServer/Packaging/Package2.cs b/WorkspaceServer/Packaging/Package2.cs index 6cdc14b47..58416e12e 100644 --- a/WorkspaceServer/Packaging/Package2.cs +++ b/WorkspaceServer/Packaging/Package2.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools; using System; using System.Collections.Generic; using System.IO; diff --git a/WorkspaceServer/Packaging/PackageAsset.cs b/WorkspaceServer/Packaging/PackageAsset.cs index 9b29afbd9..12ce65441 100644 --- a/WorkspaceServer/Packaging/PackageAsset.cs +++ b/WorkspaceServer/Packaging/PackageAsset.cs @@ -1,6 +1,7 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using MLS.Agent.Tools; using System; namespace WorkspaceServer.Packaging diff --git a/WorkspaceServer/Packaging/WebAssemblyAssetFinder.cs b/WorkspaceServer/Packaging/WebAssemblyAssetFinder.cs index 674a4c19c..e9f138048 100644 --- a/WorkspaceServer/Packaging/WebAssemblyAssetFinder.cs +++ b/WorkspaceServer/Packaging/WebAssemblyAssetFinder.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.Build.Logging.StructuredLogger; +using MLS.Agent.Tools; using System; using System.IO; using System.Threading.Tasks; diff --git a/WorkspaceServer/Servers/FSharp/RedirectedPackage.cs b/WorkspaceServer/Servers/FSharp/RedirectedPackage.cs index 814166a22..272900ad5 100644 --- a/WorkspaceServer/Servers/FSharp/RedirectedPackage.cs +++ b/WorkspaceServer/Servers/FSharp/RedirectedPackage.cs @@ -2,6 +2,8 @@ using System.IO; using System.Linq; using Microsoft.DotNet.Try.Protocol; +using MLS.Agent.Tools; +using MLS.Agent.Tools.Roslyn; using WorkspaceServer.Servers.Roslyn; using Package = WorkspaceServer.Packaging.Package;