diff --git a/README.md b/README.md index 7aa68159..97534ad6 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ What tye can do: ## Current Status -![CI](https://github.com/rynowak/tye/workflows/CI/badge.svg) +![CI](https://github.com/dotnet/tye/workflows/CI/badge.svg) -Dipper will be a combination of [Opulence](https://github.com/rynowak/opulence) and [Micronetes](https://github.com/davidfowl/micronetes) into a single tool. +Tye is the combination of [Opulence](https://github.com/rynowak/opulence) and [Micronetes](https://github.com/davidfowl/micronetes) into a single tool. There's not much to see here right now, but keep watching this space for updates. diff --git a/src/micronetes/Micronetes.Hosting.Diagnostics/DiagnosticOptions.cs b/src/Tye.Hosting.Diagnostics/DiagnosticOptions.cs similarity index 98% rename from src/micronetes/Micronetes.Hosting.Diagnostics/DiagnosticOptions.cs rename to src/Tye.Hosting.Diagnostics/DiagnosticOptions.cs index f5da6919..7beb5337 100644 --- a/src/micronetes/Micronetes.Hosting.Diagnostics/DiagnosticOptions.cs +++ b/src/Tye.Hosting.Diagnostics/DiagnosticOptions.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -namespace Micronetes.Hosting.Diagnostics +namespace Tye.Hosting.Diagnostics { public class DiagnosticOptions { diff --git a/src/micronetes/Micronetes.Hosting.Diagnostics/DiagnosticsCollector.cs b/src/Tye.Hosting.Diagnostics/DiagnosticsCollector.cs similarity index 99% rename from src/micronetes/Micronetes.Hosting.Diagnostics/DiagnosticsCollector.cs rename to src/Tye.Hosting.Diagnostics/DiagnosticsCollector.cs index be2237b7..0a8506f6 100644 --- a/src/micronetes/Micronetes.Hosting.Diagnostics/DiagnosticsCollector.cs +++ b/src/Tye.Hosting.Diagnostics/DiagnosticsCollector.cs @@ -7,8 +7,8 @@ using System.Linq; using System.Text.Json; using System.Threading; using System.Threading.Tasks; -using Micronetes.Hosting.Diagnostics.Logging; -using Micronetes.Hosting.Diagnostics.Metrics; +using Tye.Hosting.Diagnostics.Logging; +using Tye.Hosting.Diagnostics.Metrics; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Microsoft.Diagnostics.Tracing.Parsers; @@ -18,7 +18,7 @@ using OpenTelemetry.Trace; using OpenTelemetry.Trace.Export; using Serilog; -namespace Micronetes.Hosting.Diagnostics +namespace Tye.Hosting.Diagnostics { public class DiagnosticsCollector { diff --git a/src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LogObject.cs b/src/Tye.Hosting.Diagnostics/Logging/LogObject.cs similarity index 97% rename from src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LogObject.cs rename to src/Tye.Hosting.Diagnostics/Logging/LogObject.cs index 844438b8..64fbfe45 100644 --- a/src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LogObject.cs +++ b/src/Tye.Hosting.Diagnostics/Logging/LogObject.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Text.Json; -namespace Micronetes.Hosting.Diagnostics.Logging +namespace Tye.Hosting.Diagnostics.Logging { internal class LogObject : IReadOnlyList> { diff --git a/src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LogValuesFormatter.cs b/src/Tye.Hosting.Diagnostics/Logging/LogValuesFormatter.cs similarity index 99% rename from src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LogValuesFormatter.cs rename to src/Tye.Hosting.Diagnostics/Logging/LogValuesFormatter.cs index 3ee937b9..49720f50 100644 --- a/src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LogValuesFormatter.cs +++ b/src/Tye.Hosting.Diagnostics/Logging/LogValuesFormatter.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Globalization; using System.Text; -namespace Micronetes.Hosting.Diagnostics.Logging +namespace Tye.Hosting.Diagnostics.Logging { /// /// Formatter to convert the named format items like {NamedformatItem} to format. diff --git a/src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LoggerException.cs b/src/Tye.Hosting.Diagnostics/Logging/LoggerException.cs similarity index 97% rename from src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LoggerException.cs rename to src/Tye.Hosting.Diagnostics/Logging/LoggerException.cs index 76c69237..9aca7c80 100644 --- a/src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LoggerException.cs +++ b/src/Tye.Hosting.Diagnostics/Logging/LoggerException.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Runtime.Serialization; using System.Text.Json; -namespace Micronetes.Hosting.Diagnostics.Logging +namespace Tye.Hosting.Diagnostics.Logging { internal class LoggerException : Exception { diff --git a/src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/CounterPayload.cs b/src/Tye.Hosting.Diagnostics/Metrics/CounterPayload.cs similarity index 95% rename from src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/CounterPayload.cs rename to src/Tye.Hosting.Diagnostics/Metrics/CounterPayload.cs index 65f60cbf..13440458 100644 --- a/src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/CounterPayload.cs +++ b/src/Tye.Hosting.Diagnostics/Metrics/CounterPayload.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Micronetes.Hosting.Diagnostics.Metrics +namespace Tye.Hosting.Diagnostics.Metrics { internal class CounterPayload : ICounterPayload { diff --git a/src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/ICounterPayload.cs b/src/Tye.Hosting.Diagnostics/Metrics/ICounterPayload.cs similarity index 80% rename from src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/ICounterPayload.cs rename to src/Tye.Hosting.Diagnostics/Metrics/ICounterPayload.cs index becca546..88aa8c6a 100644 --- a/src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/ICounterPayload.cs +++ b/src/Tye.Hosting.Diagnostics/Metrics/ICounterPayload.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Micronetes.Hosting.Diagnostics.Metrics +namespace Tye.Hosting.Diagnostics.Metrics { internal interface ICounterPayload { diff --git a/src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/IncrementingCounterPayload.cs b/src/Tye.Hosting.Diagnostics/Metrics/IncrementingCounterPayload.cs similarity index 90% rename from src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/IncrementingCounterPayload.cs rename to src/Tye.Hosting.Diagnostics/Metrics/IncrementingCounterPayload.cs index b3e050e4..326f7c9e 100644 --- a/src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/IncrementingCounterPayload.cs +++ b/src/Tye.Hosting.Diagnostics/Metrics/IncrementingCounterPayload.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Micronetes.Hosting.Diagnostics.Metrics +namespace Tye.Hosting.Diagnostics.Metrics { internal class IncrementingCounterPayload : ICounterPayload { diff --git a/src/micronetes/Micronetes.Hosting.Diagnostics/Micronetes.Hosting.Diagnostics.csproj b/src/Tye.Hosting.Diagnostics/Tye.Hosting.Diagnostics.csproj similarity index 100% rename from src/micronetes/Micronetes.Hosting.Diagnostics/Micronetes.Hosting.Diagnostics.csproj rename to src/Tye.Hosting.Diagnostics/Tye.Hosting.Diagnostics.csproj diff --git a/src/micronetes/Micronetes.Hosting.Runtime/HostingRuntimeHelpers.cs b/src/Tye.Hosting.Runtime/HostingRuntimeHelpers.cs similarity index 82% rename from src/micronetes/Micronetes.Hosting.Runtime/HostingRuntimeHelpers.cs rename to src/Tye.Hosting.Runtime/HostingRuntimeHelpers.cs index b01cb39b..35692b24 100644 --- a/src/micronetes/Micronetes.Hosting.Runtime/HostingRuntimeHelpers.cs +++ b/src/Tye.Hosting.Runtime/HostingRuntimeHelpers.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Micronetes.Hosting.Runtime +namespace Tye.Hosting.Runtime { // This exists solely as a way to locate this dll public class HostingRuntimeHelpers diff --git a/src/micronetes/Micronetes.Hosting.Runtime/StartupHook.cs b/src/Tye.Hosting.Runtime/StartupHook.cs similarity index 100% rename from src/micronetes/Micronetes.Hosting.Runtime/StartupHook.cs rename to src/Tye.Hosting.Runtime/StartupHook.cs diff --git a/src/micronetes/Micronetes.Hosting.Runtime/Micronetes.Hosting.Runtime.csproj b/src/Tye.Hosting.Runtime/Tye.Hosting.Runtime.csproj similarity index 100% rename from src/micronetes/Micronetes.Hosting.Runtime/Micronetes.Hosting.Runtime.csproj rename to src/Tye.Hosting.Runtime/Tye.Hosting.Runtime.csproj diff --git a/src/micronetes/Micronetes.Hosting/AggregateApplicationProcessor.cs b/src/Tye.Hosting/AggregateApplicationProcessor.cs similarity index 94% rename from src/micronetes/Micronetes.Hosting/AggregateApplicationProcessor.cs rename to src/Tye.Hosting/AggregateApplicationProcessor.cs index 022b8d6d..0ac1eeac 100644 --- a/src/micronetes/Micronetes.Hosting/AggregateApplicationProcessor.cs +++ b/src/Tye.Hosting/AggregateApplicationProcessor.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Micronetes.Hosting.Model; +using Tye.Hosting.Model; -namespace Micronetes.Hosting +namespace Tye.Hosting { public class AggregateApplicationProcessor : IApplicationProcessor { diff --git a/src/micronetes/Micronetes.Hosting/Dashboard/App.razor b/src/Tye.Hosting/Dashboard/App.razor similarity index 84% rename from src/micronetes/Micronetes.Hosting/Dashboard/App.razor rename to src/Tye.Hosting/Dashboard/App.razor index 34ef93ee..d09d793f 100644 --- a/src/micronetes/Micronetes.Hosting/Dashboard/App.razor +++ b/src/Tye.Hosting/Dashboard/App.razor @@ -1,4 +1,4 @@ - + diff --git a/src/micronetes/Micronetes.Hosting/Dashboard/Pages/Index.razor b/src/Tye.Hosting/Dashboard/Pages/Index.razor similarity index 100% rename from src/micronetes/Micronetes.Hosting/Dashboard/Pages/Index.razor rename to src/Tye.Hosting/Dashboard/Pages/Index.razor diff --git a/src/micronetes/Micronetes.Hosting/Dashboard/Pages/Logs.razor b/src/Tye.Hosting/Dashboard/Pages/Logs.razor similarity index 100% rename from src/micronetes/Micronetes.Hosting/Dashboard/Pages/Logs.razor rename to src/Tye.Hosting/Dashboard/Pages/Logs.razor diff --git a/src/micronetes/Micronetes.Hosting/Dashboard/Pages/ServiceDetails.razor b/src/Tye.Hosting/Dashboard/Pages/ServiceDetails.razor similarity index 100% rename from src/micronetes/Micronetes.Hosting/Dashboard/Pages/ServiceDetails.razor rename to src/Tye.Hosting/Dashboard/Pages/ServiceDetails.razor diff --git a/src/micronetes/Micronetes.Hosting/Dashboard/Pages/_Host.cshtml b/src/Tye.Hosting/Dashboard/Pages/_Host.cshtml similarity index 95% rename from src/micronetes/Micronetes.Hosting/Dashboard/Pages/_Host.cshtml rename to src/Tye.Hosting/Dashboard/Pages/_Host.cshtml index 47dd6658..b9a13183 100644 --- a/src/micronetes/Micronetes.Hosting/Dashboard/Pages/_Host.cshtml +++ b/src/Tye.Hosting/Dashboard/Pages/_Host.cshtml @@ -1,5 +1,5 @@ @page "/" -@namespace Micronetes.Hosting.Dashboard.Pages +@namespace Tye.Hosting.Dashboard.Pages @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers @{ Layout = null; diff --git a/src/micronetes/Micronetes.Hosting/Dashboard/Shared/MainLayout.razor b/src/Tye.Hosting/Dashboard/Shared/MainLayout.razor similarity index 100% rename from src/micronetes/Micronetes.Hosting/Dashboard/Shared/MainLayout.razor rename to src/Tye.Hosting/Dashboard/Shared/MainLayout.razor diff --git a/src/micronetes/Micronetes.Hosting/Dashboard/Shared/NavMenu.razor b/src/Tye.Hosting/Dashboard/Shared/NavMenu.razor similarity index 100% rename from src/micronetes/Micronetes.Hosting/Dashboard/Shared/NavMenu.razor rename to src/Tye.Hosting/Dashboard/Shared/NavMenu.razor diff --git a/src/micronetes/Micronetes.Hosting/Dashboard/_Imports.razor b/src/Tye.Hosting/Dashboard/_Imports.razor similarity index 66% rename from src/micronetes/Micronetes.Hosting/Dashboard/_Imports.razor rename to src/Tye.Hosting/Dashboard/_Imports.razor index 8f289cd1..1550c4af 100644 --- a/src/micronetes/Micronetes.Hosting/Dashboard/_Imports.razor +++ b/src/Tye.Hosting/Dashboard/_Imports.razor @@ -5,7 +5,7 @@ @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web @using Microsoft.JSInterop -@using Micronetes.Hosting -@using Micronetes.Hosting.Dashboard.Shared -@using Micronetes.Hosting.Dashboard.Pages -@using Micronetes.Hosting.Model +@using Tye.Hosting +@using Tye.Hosting.Dashboard.Shared +@using Tye.Hosting.Dashboard.Pages +@using Tye.Hosting.Model diff --git a/src/micronetes/Micronetes.Hosting/DockerRunner.cs b/src/Tye.Hosting/DockerRunner.cs similarity index 99% rename from src/micronetes/Micronetes.Hosting/DockerRunner.cs rename to src/Tye.Hosting/DockerRunner.cs index 1848cf1d..f64131fc 100644 --- a/src/micronetes/Micronetes.Hosting/DockerRunner.cs +++ b/src/Tye.Hosting/DockerRunner.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Micronetes.Hosting.Model; +using Tye.Hosting.Model; using Microsoft.Extensions.Logging; -namespace Micronetes.Hosting +namespace Tye.Hosting { public class DockerRunner : IApplicationProcessor { diff --git a/src/micronetes/Micronetes.Hosting/EventPipeDiagnosticsRunner.cs b/src/Tye.Hosting/EventPipeDiagnosticsRunner.cs similarity index 97% rename from src/micronetes/Micronetes.Hosting/EventPipeDiagnosticsRunner.cs rename to src/Tye.Hosting/EventPipeDiagnosticsRunner.cs index d5fb1c31..5e63a0e1 100644 --- a/src/micronetes/Micronetes.Hosting/EventPipeDiagnosticsRunner.cs +++ b/src/Tye.Hosting/EventPipeDiagnosticsRunner.cs @@ -2,11 +2,11 @@ using System.IO; using System.Threading; using System.Threading.Tasks; -using Micronetes.Hosting.Diagnostics; -using Micronetes.Hosting.Model; +using Tye.Hosting.Diagnostics; +using Tye.Hosting.Model; using Microsoft.Extensions.Logging; -namespace Micronetes.Hosting +namespace Tye.Hosting { public class EventPipeDiagnosticsRunner : IApplicationProcessor { diff --git a/src/micronetes/Micronetes.Hosting/IApplicationProcessor.cs b/src/Tye.Hosting/IApplicationProcessor.cs similarity index 75% rename from src/micronetes/Micronetes.Hosting/IApplicationProcessor.cs rename to src/Tye.Hosting/IApplicationProcessor.cs index 9c3dc7fe..0bb7619c 100644 --- a/src/micronetes/Micronetes.Hosting/IApplicationProcessor.cs +++ b/src/Tye.Hosting/IApplicationProcessor.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using Micronetes.Hosting.Model; +using Tye.Hosting.Model; -namespace Micronetes.Hosting +namespace Tye.Hosting { public interface IApplicationProcessor { diff --git a/src/micronetes/Micronetes.Hosting/Infrastructure/ProcessResult.cs b/src/Tye.Hosting/Infrastructure/ProcessResult.cs similarity index 92% rename from src/micronetes/Micronetes.Hosting/Infrastructure/ProcessResult.cs rename to src/Tye.Hosting/Infrastructure/ProcessResult.cs index f6a4f2d3..a66f3c0a 100644 --- a/src/micronetes/Micronetes.Hosting/Infrastructure/ProcessResult.cs +++ b/src/Tye.Hosting/Infrastructure/ProcessResult.cs @@ -1,4 +1,4 @@ -namespace Micronetes.Hosting +namespace Tye.Hosting { internal class ProcessResult { diff --git a/src/micronetes/Micronetes.Hosting/Infrastructure/ProcessUtil.cs b/src/Tye.Hosting/Infrastructure/ProcessUtil.cs similarity index 99% rename from src/micronetes/Micronetes.Hosting/Infrastructure/ProcessUtil.cs rename to src/Tye.Hosting/Infrastructure/ProcessUtil.cs index 3c81feeb..4e80f92c 100644 --- a/src/micronetes/Micronetes.Hosting/Infrastructure/ProcessUtil.cs +++ b/src/Tye.Hosting/Infrastructure/ProcessUtil.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Mono.Unix.Native; -namespace Micronetes.Hosting +namespace Tye.Hosting { internal static class ProcessUtil { diff --git a/src/micronetes/Micronetes.Hosting/Model/Application.cs b/src/Tye.Hosting/Model/Application.cs similarity index 98% rename from src/micronetes/Micronetes.Hosting/Model/Application.cs rename to src/Tye.Hosting/Model/Application.cs index fe091570..209730e9 100644 --- a/src/micronetes/Micronetes.Hosting/Model/Application.cs +++ b/src/Tye.Hosting/Model/Application.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace Micronetes.Hosting.Model +namespace Tye.Hosting.Model { public class Application { diff --git a/src/micronetes/Micronetes.Hosting/Model/DockerRunInfo.cs b/src/Tye.Hosting/Model/DockerRunInfo.cs similarity index 87% rename from src/micronetes/Micronetes.Hosting/Model/DockerRunInfo.cs rename to src/Tye.Hosting/Model/DockerRunInfo.cs index 912c0923..d2c5547d 100644 --- a/src/micronetes/Micronetes.Hosting/Model/DockerRunInfo.cs +++ b/src/Tye.Hosting/Model/DockerRunInfo.cs @@ -1,4 +1,4 @@ -namespace Micronetes.Hosting.Model +namespace Tye.Hosting.Model { public class DockerRunInfo : RunInfo { diff --git a/src/micronetes/Micronetes.Hosting/Model/ExecutableRunInfo.cs b/src/Tye.Hosting/Model/ExecutableRunInfo.cs similarity index 91% rename from src/micronetes/Micronetes.Hosting/Model/ExecutableRunInfo.cs rename to src/Tye.Hosting/Model/ExecutableRunInfo.cs index 757f4b50..cdcf7ac2 100644 --- a/src/micronetes/Micronetes.Hosting/Model/ExecutableRunInfo.cs +++ b/src/Tye.Hosting/Model/ExecutableRunInfo.cs @@ -1,4 +1,4 @@ -namespace Micronetes.Hosting.Model +namespace Tye.Hosting.Model { public class ExecutableRunInfo : RunInfo { diff --git a/src/micronetes/Micronetes.Hosting/Model/ProjectRunInfo.cs b/src/Tye.Hosting/Model/ProjectRunInfo.cs similarity index 90% rename from src/micronetes/Micronetes.Hosting/Model/ProjectRunInfo.cs rename to src/Tye.Hosting/Model/ProjectRunInfo.cs index 8ce36626..cd069493 100644 --- a/src/micronetes/Micronetes.Hosting/Model/ProjectRunInfo.cs +++ b/src/Tye.Hosting/Model/ProjectRunInfo.cs @@ -1,4 +1,4 @@ -namespace Micronetes.Hosting.Model +namespace Tye.Hosting.Model { public class ProjectRunInfo : RunInfo { diff --git a/src/micronetes/Micronetes.Hosting/Model/RunInfo.cs b/src/Tye.Hosting/Model/RunInfo.cs similarity index 56% rename from src/micronetes/Micronetes.Hosting/Model/RunInfo.cs rename to src/Tye.Hosting/Model/RunInfo.cs index 874e1e7d..2b022405 100644 --- a/src/micronetes/Micronetes.Hosting/Model/RunInfo.cs +++ b/src/Tye.Hosting/Model/RunInfo.cs @@ -1,4 +1,4 @@ -namespace Micronetes.Hosting.Model +namespace Tye.Hosting.Model { public abstract class RunInfo { diff --git a/src/micronetes/Micronetes.Hosting/Model/Service.cs b/src/Tye.Hosting/Model/Service.cs similarity index 99% rename from src/micronetes/Micronetes.Hosting/Model/Service.cs rename to src/Tye.Hosting/Model/Service.cs index 4534fa4d..153f96e9 100644 --- a/src/micronetes/Micronetes.Hosting/Model/Service.cs +++ b/src/Tye.Hosting/Model/Service.cs @@ -5,7 +5,7 @@ using System.Reactive.Subjects; using System.Text.Json; using System.Text.Json.Serialization; -namespace Micronetes.Hosting.Model +namespace Tye.Hosting.Model { public class Service { diff --git a/src/micronetes/Micronetes.Hosting/Model/ServiceBinding.cs b/src/Tye.Hosting/Model/ServiceBinding.cs similarity index 89% rename from src/micronetes/Micronetes.Hosting/Model/ServiceBinding.cs rename to src/Tye.Hosting/Model/ServiceBinding.cs index 5f6b7eee..672513fa 100644 --- a/src/micronetes/Micronetes.Hosting/Model/ServiceBinding.cs +++ b/src/Tye.Hosting/Model/ServiceBinding.cs @@ -1,4 +1,4 @@ -namespace Micronetes.Hosting.Model +namespace Tye.Hosting.Model { public class ServiceBinding { diff --git a/src/micronetes/Micronetes.Hosting/Model/ServiceDescription.cs b/src/Tye.Hosting/Model/ServiceDescription.cs similarity index 95% rename from src/micronetes/Micronetes.Hosting/Model/ServiceDescription.cs rename to src/Tye.Hosting/Model/ServiceDescription.cs index b680d769..ed15919f 100644 --- a/src/micronetes/Micronetes.Hosting/Model/ServiceDescription.cs +++ b/src/Tye.Hosting/Model/ServiceDescription.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Micronetes.Hosting.Model +namespace Tye.Hosting.Model { public class ServiceDescription { diff --git a/src/micronetes/Micronetes.Hosting/Model/ServiceState.cs b/src/Tye.Hosting/Model/ServiceState.cs similarity index 84% rename from src/micronetes/Micronetes.Hosting/Model/ServiceState.cs rename to src/Tye.Hosting/Model/ServiceState.cs index 7b0cccc7..81b6c79e 100644 --- a/src/micronetes/Micronetes.Hosting/Model/ServiceState.cs +++ b/src/Tye.Hosting/Model/ServiceState.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Micronetes.Hosting.Model +namespace Tye.Hosting.Model { public enum ServiceState { diff --git a/src/micronetes/Micronetes.Hosting/ProcessRunner.cs b/src/Tye.Hosting/ProcessRunner.cs similarity index 99% rename from src/micronetes/Micronetes.Hosting/ProcessRunner.cs rename to src/Tye.Hosting/ProcessRunner.cs index 5c80f231..a405063f 100644 --- a/src/micronetes/Micronetes.Hosting/ProcessRunner.cs +++ b/src/Tye.Hosting/ProcessRunner.cs @@ -5,10 +5,10 @@ using System.Linq; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; -using Micronetes.Hosting.Model; +using Tye.Hosting.Model; using Microsoft.Extensions.Logging; -namespace Micronetes.Hosting +namespace Tye.Hosting { public class ProcessRunner : IApplicationProcessor { diff --git a/src/micronetes/Micronetes.Hosting/ProcessRunnerOptions.cs b/src/Tye.Hosting/ProcessRunnerOptions.cs similarity index 94% rename from src/micronetes/Micronetes.Hosting/ProcessRunnerOptions.cs rename to src/Tye.Hosting/ProcessRunnerOptions.cs index 8ae8a261..bfa086cd 100644 --- a/src/micronetes/Micronetes.Hosting/ProcessRunnerOptions.cs +++ b/src/Tye.Hosting/ProcessRunnerOptions.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Micronetes.Hosting +namespace Tye.Hosting { public class ProcessRunnerOptions { diff --git a/src/micronetes/Micronetes.Hosting/Properties/launchSettings.json b/src/Tye.Hosting/Properties/launchSettings.json similarity index 91% rename from src/micronetes/Micronetes.Hosting/Properties/launchSettings.json rename to src/Tye.Hosting/Properties/launchSettings.json index b91e6b94..344d3a90 100644 --- a/src/micronetes/Micronetes.Hosting/Properties/launchSettings.json +++ b/src/Tye.Hosting/Properties/launchSettings.json @@ -4,7 +4,7 @@ "anonymousAuthentication": true }, "profiles": { - "Micronetes.Hosting": { + "Tye.Hosting": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { diff --git a/src/micronetes/Micronetes.Hosting/ProxyService.cs b/src/Tye.Hosting/ProxyService.cs similarity index 99% rename from src/micronetes/Micronetes.Hosting/ProxyService.cs rename to src/Tye.Hosting/ProxyService.cs index b5b538dc..fbd3e65b 100644 --- a/src/micronetes/Micronetes.Hosting/ProxyService.cs +++ b/src/Tye.Hosting/ProxyService.cs @@ -7,14 +7,14 @@ using System.Net.Sockets; using System.Threading; using System.Threading.Tasks; using Bedrock.Framework; -using Micronetes.Hosting.Model; +using Tye.Hosting.Model; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -namespace Micronetes.Hosting +namespace Tye.Hosting { public class ProxyService : IApplicationProcessor { @@ -84,7 +84,7 @@ namespace Micronetes.Hosting { long count = 0; - // o.UseConnectionLogging("Micronetes.Proxy"); + // o.UseConnectionLogging("Tye.Proxy"); o.Run(async connection => { diff --git a/src/micronetes/Micronetes.Hosting/Micronetes.Hosting.csproj b/src/Tye.Hosting/Tye.Hosting.csproj similarity index 81% rename from src/micronetes/Micronetes.Hosting/Micronetes.Hosting.csproj rename to src/Tye.Hosting/Tye.Hosting.csproj index 08482f09..4e8488a3 100644 --- a/src/micronetes/Micronetes.Hosting/Micronetes.Hosting.csproj +++ b/src/Tye.Hosting/Tye.Hosting.csproj @@ -14,7 +14,7 @@ - + @@ -30,8 +30,8 @@ - - + + diff --git a/src/micronetes/Micronetes.Hosting/MicronetesApi.cs b/src/Tye.Hosting/TyeDashboardApi.cs similarity index 97% rename from src/micronetes/Micronetes.Hosting/MicronetesApi.cs rename to src/Tye.Hosting/TyeDashboardApi.cs index e1c81cf7..a76d7877 100644 --- a/src/micronetes/Micronetes.Hosting/MicronetesApi.cs +++ b/src/Tye.Hosting/TyeDashboardApi.cs @@ -2,19 +2,19 @@ using System.Text; using System.Text.Json; using System.Threading.Tasks; -using Micronetes.Hosting.Model; +using Tye.Hosting.Model; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -namespace Micronetes.Hosting +namespace Tye.Hosting { - public class MicronetesApi + public class TyeDashboardApi { private readonly JsonSerializerOptions _options; - public MicronetesApi() + public TyeDashboardApi() { _options = new JsonSerializerOptions() { diff --git a/src/micronetes/Micronetes.Hosting/MicronetesHost.cs b/src/Tye.Hosting/TyeHost.cs similarity index 94% rename from src/micronetes/Micronetes.Hosting/MicronetesHost.cs rename to src/Tye.Hosting/TyeHost.cs index 18264ead..afdbe7b6 100644 --- a/src/micronetes/Micronetes.Hosting/MicronetesHost.cs +++ b/src/Tye.Hosting/TyeHost.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using System.Threading.Tasks; -using Micronetes.Hosting.Diagnostics; -using Micronetes.Hosting.Model; +using Tye.Hosting.Diagnostics; +using Tye.Hosting.Model; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.FileProviders; @@ -10,9 +10,9 @@ using Microsoft.Extensions.Logging; using Serilog; using Serilog.Filters; -namespace Micronetes.Hosting +namespace Tye.Hosting { - public class MicronetesHost + public class TyeHost { public static async Task RunAsync(Application application, string[] args) { @@ -35,7 +35,7 @@ namespace Micronetes.Hosting builder.Services.AddOptions() .PostConfigure(o => { - var fileProvider = new ManifestEmbeddedFileProvider(typeof(MicronetesHost).Assembly, "wwwroot"); + var fileProvider = new ManifestEmbeddedFileProvider(typeof(TyeHost).Assembly, "wwwroot"); // Make sure we don't remove the existing file providers (blazor needs this) o.FileProvider = new CompositeFileProvider(o.FileProvider, fileProvider); @@ -55,7 +55,7 @@ namespace Micronetes.Hosting app.UseRouting(); - var api = new MicronetesApi(); + var api = new TyeDashboardApi(); api.MapRoutes(app); diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/bootstrap/bootstrap.min.css b/src/Tye.Hosting/wwwroot/css/bootstrap/bootstrap.min.css similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/bootstrap/bootstrap.min.css rename to src/Tye.Hosting/wwwroot/css/bootstrap/bootstrap.min.css diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/bootstrap/bootstrap.min.css.map b/src/Tye.Hosting/wwwroot/css/bootstrap/bootstrap.min.css.map similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/bootstrap/bootstrap.min.css.map rename to src/Tye.Hosting/wwwroot/css/bootstrap/bootstrap.min.css.map diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/FONT-LICENSE b/src/Tye.Hosting/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/FONT-LICENSE rename to src/Tye.Hosting/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/ICON-LICENSE b/src/Tye.Hosting/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/ICON-LICENSE rename to src/Tye.Hosting/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/README.md b/src/Tye.Hosting/wwwroot/css/open-iconic/README.md similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/README.md rename to src/Tye.Hosting/wwwroot/css/open-iconic/README.md diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/src/Tye.Hosting/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to src/Tye.Hosting/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to src/Tye.Hosting/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/css/site.css b/src/Tye.Hosting/wwwroot/css/site.css similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/css/site.css rename to src/Tye.Hosting/wwwroot/css/site.css diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/favicon.ico b/src/Tye.Hosting/wwwroot/favicon.ico similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/favicon.ico rename to src/Tye.Hosting/wwwroot/favicon.ico diff --git a/src/micronetes/Micronetes.Hosting/wwwroot/img/circle-icons-shipwheel.svg b/src/Tye.Hosting/wwwroot/img/circle-icons-shipwheel.svg similarity index 100% rename from src/micronetes/Micronetes.Hosting/wwwroot/img/circle-icons-shipwheel.svg rename to src/Tye.Hosting/wwwroot/img/circle-icons-shipwheel.svg diff --git a/src/tye/ConfigModel/ConfigApplication.cs b/src/tye/ConfigModel/ConfigApplication.cs index 57aaf01e..56715cf4 100644 --- a/src/tye/ConfigModel/ConfigApplication.cs +++ b/src/tye/ConfigModel/ConfigApplication.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -using Micronetes.Hosting.Model; +using Tye.Hosting.Model; using YamlDotNet.Serialization; namespace Tye.ConfigModel @@ -18,9 +18,9 @@ namespace Tye.ConfigModel public List Services { get; set; } = new List(); - public Micronetes.Hosting.Model.Application ToHostingApplication() + public Tye.Hosting.Model.Application ToHostingApplication() { - var services = new Dictionary(); + var services = new Dictionary(); foreach (var service in Services) { RunInfo? runInfo; @@ -45,14 +45,14 @@ namespace Tye.ConfigModel throw new InvalidOperationException($"Cannot figure out how to run service '{service.Name}'."); } - var description = new Micronetes.Hosting.Model.ServiceDescription(service.Name, runInfo) + var description = new Tye.Hosting.Model.ServiceDescription(service.Name, runInfo) { Replicas = service.Replicas ?? 1, }; foreach (var binding in service.Bindings) { - description.Bindings.Add(new Micronetes.Hosting.Model.ServiceBinding() + description.Bindings.Add(new Tye.Hosting.Model.ServiceBinding() { ConnectionString = binding.ConnectionString, Host = binding.Host, @@ -68,10 +68,10 @@ namespace Tye.ConfigModel description.Configuration.Add(new ConfigurationSource(entry.Name, entry.Value)); } - services.Add(service.Name, new Micronetes.Hosting.Model.Service(description)); + services.Add(service.Name, new Tye.Hosting.Model.Service(description)); } - return new Micronetes.Hosting.Model.Application(Source, services); + return new Tye.Hosting.Model.Application(Source, services); } } } diff --git a/src/tye/Program.RunCommand.cs b/src/tye/Program.RunCommand.cs index fdfdc7ee..292b8746 100644 --- a/src/tye/Program.RunCommand.cs +++ b/src/tye/Program.RunCommand.cs @@ -2,7 +2,7 @@ using System.CommandLine; using System.CommandLine.Invocation; using System.IO; -using Micronetes.Hosting; +using Tye.Hosting; using Tye.ConfigModel; namespace Tye @@ -59,7 +59,7 @@ namespace Tye } var application = ConfigFactory.FromFile(path); - return MicronetesHost.RunAsync(application.ToHostingApplication(), args); + return TyeHost.RunAsync(application.ToHostingApplication(), args); }); return command; diff --git a/src/tye/Properties/launchSettings.json b/src/tye/Properties/launchSettings.json new file mode 100644 index 00000000..977be0b3 --- /dev/null +++ b/src/tye/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "tye": { + "commandName": "Project", + "commandLineArgs": "run C:\\Users\\jukotali\\code\\tye\\samples\\multi-project\\tye.yaml" + } + } +} \ No newline at end of file diff --git a/src/tye/tye.csproj b/src/tye/tye.csproj index 4bebde16..8b7558a1 100644 --- a/src/tye/tye.csproj +++ b/src/tye/tye.csproj @@ -10,7 +10,7 @@ - + diff --git a/tye.sln b/tye.sln index f7260601..3b0735e9 100644 --- a/tye.sln +++ b/tye.sln @@ -11,13 +11,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F19B02EB-A EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "E2ETest", "test\E2ETest\E2ETest.csproj", "{D15E5FF6-C1E7-4110-A2BE-06ADA7ACA82B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "micronetes", "micronetes", "{B2C364E4-969E-4770-BF5F-BE65D292F70A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tye.Hosting", "src\Tye.Hosting\Tye.Hosting.csproj", "{0F4F5A86-DD27-4AF9-BF97-221EAD5040E7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Micronetes.Hosting", "src\micronetes\Micronetes.Hosting\Micronetes.Hosting.csproj", "{0F4F5A86-DD27-4AF9-BF97-221EAD5040E7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tye.Hosting.Diagnostics", "src\Tye.Hosting.Diagnostics\Tye.Hosting.Diagnostics.csproj", "{CEBFC149-8162-4A0A-9AD4-40498B9172CD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Micronetes.Hosting.Diagnostics", "src\micronetes\Micronetes.Hosting.Diagnostics\Micronetes.Hosting.Diagnostics.csproj", "{CEBFC149-8162-4A0A-9AD4-40498B9172CD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Micronetes.Hosting.Runtime", "src\micronetes\Micronetes.Hosting.Runtime\Micronetes.Hosting.Runtime.csproj", "{34719884-1338-4965-BA2A-F98DB03733C2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tye.Hosting.Runtime", "src\Tye.Hosting.Runtime\Tye.Hosting.Runtime.csproj", "{34719884-1338-4965-BA2A-F98DB03733C2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tye.Core", "src\Tye.Core\Tye.Core.csproj", "{D0359C69-6EA9-4B03-9455-90E8E04F1CB0}" EndProject @@ -110,10 +108,9 @@ Global GlobalSection(NestedProjects) = preSolution {9BFE4070-D6D8-41F8-B92E-F85C3DCD7AB8} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601} {D15E5FF6-C1E7-4110-A2BE-06ADA7ACA82B} = {F19B02EB-A372-417A-B2C2-EA0D5A3C76D5} - {B2C364E4-969E-4770-BF5F-BE65D292F70A} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601} - {0F4F5A86-DD27-4AF9-BF97-221EAD5040E7} = {B2C364E4-969E-4770-BF5F-BE65D292F70A} - {CEBFC149-8162-4A0A-9AD4-40498B9172CD} = {B2C364E4-969E-4770-BF5F-BE65D292F70A} - {34719884-1338-4965-BA2A-F98DB03733C2} = {B2C364E4-969E-4770-BF5F-BE65D292F70A} + {0F4F5A86-DD27-4AF9-BF97-221EAD5040E7} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601} + {CEBFC149-8162-4A0A-9AD4-40498B9172CD} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601} + {34719884-1338-4965-BA2A-F98DB03733C2} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601} {D0359C69-6EA9-4B03-9455-90E8E04F1CB0} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601} EndGlobalSection EndGlobal