Make micronetes projects disappear (#55)

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.
 

src/micronetes/Micronetes.Hosting.Diagnostics/DiagnosticOptions.cs → 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
     {

src/micronetes/Micronetes.Hosting.Diagnostics/DiagnosticsCollector.cs → 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 Tye.Hosting.Diagnostics.Logging;
-using Micronetes.Hosting.Diagnostics.Metrics;
+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
     {

src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LogObject.cs → 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<KeyValuePair<string, object>>
     {

src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LogValuesFormatter.cs → 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
 {
     /// <summary>
     /// Formatter to convert the named format items like {NamedformatItem} to <see cref="M:string.Format"/> format.

src/micronetes/Micronetes.Hosting.Diagnostics/Logging/LoggerException.cs → 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
     {

src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/CounterPayload.cs → 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
     {

src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/ICounterPayload.cs → 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
     {

src/micronetes/Micronetes.Hosting.Diagnostics/Metrics/IncrementingCounterPayload.cs → 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
     {

src/micronetes/Micronetes.Hosting.Runtime/HostingRuntimeHelpers.cs → 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

src/micronetes/Micronetes.Hosting/AggregateApplicationProcessor.cs → 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
     {

src/micronetes/Micronetes.Hosting/Dashboard/App.razor → src/Tye.Hosting/Dashboard/App.razor

@@ -1,4 +1,4 @@
-<Router AppAssembly="@typeof(MicronetesHost).Assembly">
+<Router AppAssembly="@typeof(TyeHost).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
     </Found>

src/micronetes/Micronetes.Hosting/Dashboard/Pages/_Host.cshtml → 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;

src/micronetes/Micronetes.Hosting/Dashboard/_Imports.razor → 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 Tye.Hosting
-@using Micronetes.Hosting.Dashboard.Shared
+@using Tye.Hosting.Dashboard.Shared
-@using Micronetes.Hosting.Dashboard.Pages
+@using Tye.Hosting.Dashboard.Pages
-@using Micronetes.Hosting.Model
+@using Tye.Hosting.Model

src/micronetes/Micronetes.Hosting/DockerRunner.cs → 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
     {

src/micronetes/Micronetes.Hosting/EventPipeDiagnosticsRunner.cs → src/Tye.Hosting/EventPipeDiagnosticsRunner.cs

@@ -2,11 +2,11 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Micronetes.Hosting.Diagnostics;
+using Tye.Hosting.Diagnostics;
-using Micronetes.Hosting.Model;
+using Tye.Hosting.Model;
 using Microsoft.Extensions.Logging;
 
-namespace Micronetes.Hosting
+namespace Tye.Hosting
 {
     public class EventPipeDiagnosticsRunner : IApplicationProcessor
     {

src/micronetes/Micronetes.Hosting/IApplicationProcessor.cs → 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
     {

src/micronetes/Micronetes.Hosting/Infrastructure/ProcessResult.cs → src/Tye.Hosting/Infrastructure/ProcessResult.cs

@@ -1,4 +1,4 @@
-namespace Micronetes.Hosting
+namespace Tye.Hosting
 {
     internal class ProcessResult
     {

src/micronetes/Micronetes.Hosting/Infrastructure/ProcessUtil.cs → 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
     {

src/micronetes/Micronetes.Hosting/Model/Application.cs → 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
     {

src/micronetes/Micronetes.Hosting/Model/DockerRunInfo.cs → src/Tye.Hosting/Model/DockerRunInfo.cs

@@ -1,4 +1,4 @@
-namespace Micronetes.Hosting.Model
+namespace Tye.Hosting.Model
 {
     public class DockerRunInfo : RunInfo
     {

src/micronetes/Micronetes.Hosting/Model/ExecutableRunInfo.cs → src/Tye.Hosting/Model/ExecutableRunInfo.cs

@@ -1,4 +1,4 @@
-namespace Micronetes.Hosting.Model
+namespace Tye.Hosting.Model
 {
     public class ExecutableRunInfo : RunInfo
     {

src/micronetes/Micronetes.Hosting/Model/ProjectRunInfo.cs → src/Tye.Hosting/Model/ProjectRunInfo.cs

@@ -1,4 +1,4 @@
-namespace Micronetes.Hosting.Model
+namespace Tye.Hosting.Model
 {
     public class ProjectRunInfo : RunInfo
     {

src/micronetes/Micronetes.Hosting/Model/RunInfo.cs → src/Tye.Hosting/Model/RunInfo.cs

@@ -1,4 +1,4 @@
-namespace Micronetes.Hosting.Model
+namespace Tye.Hosting.Model
 {
     public abstract class RunInfo
     {

src/micronetes/Micronetes.Hosting/Model/Service.cs → 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
     {

src/micronetes/Micronetes.Hosting/Model/ServiceBinding.cs → src/Tye.Hosting/Model/ServiceBinding.cs

@@ -1,4 +1,4 @@
-namespace Micronetes.Hosting.Model
+namespace Tye.Hosting.Model
 {
     public class ServiceBinding
     {

src/micronetes/Micronetes.Hosting/Model/ServiceDescription.cs → 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
     {

src/micronetes/Micronetes.Hosting/Model/ServiceState.cs → 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
     {

src/micronetes/Micronetes.Hosting/ProcessRunner.cs → 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
     {

src/micronetes/Micronetes.Hosting/ProcessRunnerOptions.cs → 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
     {

src/micronetes/Micronetes.Hosting/Properties/launchSettings.json → src/Tye.Hosting/Properties/launchSettings.json

@@ -4,7 +4,7 @@
     "anonymousAuthentication": true
   },
   "profiles": {
-    "Micronetes.Hosting": {
+    "Tye.Hosting": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {

src/micronetes/Micronetes.Hosting/ProxyService.cs → 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 =>
                                         {

src/micronetes/Micronetes.Hosting/Micronetes.Hosting.csproj → src/Tye.Hosting/Tye.Hosting.csproj

@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\tye\NameSanitizer.cs" Link="NameSanitizer.cs" />
+    <Compile Include="..\tye\NameSanitizer.cs" Link="NameSanitizer.cs" />
   </ItemGroup>
   
   <ItemGroup>
@@ -30,8 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Micronetes.Hosting.Diagnostics\Micronetes.Hosting.Diagnostics.csproj" />
+    <ProjectReference Include="..\Tye.Hosting.Diagnostics\Tye.Hosting.Diagnostics.csproj" />
-    <ProjectReference Include="..\Micronetes.Hosting.Runtime\Micronetes.Hosting.Runtime.csproj" />
+    <ProjectReference Include="..\Tye.Hosting.Runtime\Tye.Hosting.Runtime.csproj" />
   </ItemGroup>
 
 </Project>

src/micronetes/Micronetes.Hosting/MicronetesApi.cs → 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()
             {

src/micronetes/Micronetes.Hosting/MicronetesHost.cs → src/Tye.Hosting/TyeHost.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Micronetes.Hosting.Diagnostics;
+using Tye.Hosting.Diagnostics;
-using Micronetes.Hosting.Model;
+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<StaticFileOptions>()
                 .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);
 

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<ConfigService> Services { get; set; } = new List<ConfigService>();
 
-        public Micronetes.Hosting.Model.Application ToHostingApplication()
+        public Tye.Hosting.Model.Application ToHostingApplication()
         {
-            var services = new Dictionary<string, Micronetes.Hosting.Model.Service>();
+            var services = new Dictionary<string, Tye.Hosting.Model.Service>();
             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);
         }
     }
 }

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;

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"
+    }
+  }
+}

src/tye/tye.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\micronetes\Micronetes.Hosting\Micronetes.Hosting.csproj" />
+    <ProjectReference Include="..\Tye.Hosting\Tye.Hosting.csproj" />
     <ProjectReference Include="..\Tye.Core\Tye.Core.csproj" />
   </ItemGroup>
 

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}"
+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}") = "Micronetes.Hosting.Runtime", "src\micronetes\Micronetes.Hosting.Runtime\Micronetes.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} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601}
-		{0F4F5A86-DD27-4AF9-BF97-221EAD5040E7} = {B2C364E4-969E-4770-BF5F-BE65D292F70A}
+		{CEBFC149-8162-4A0A-9AD4-40498B9172CD} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601}
-		{CEBFC149-8162-4A0A-9AD4-40498B9172CD} = {B2C364E4-969E-4770-BF5F-BE65D292F70A}
+		{34719884-1338-4965-BA2A-F98DB03733C2} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601}
-		{34719884-1338-4965-BA2A-F98DB03733C2} = {B2C364E4-969E-4770-BF5F-BE65D292F70A}
 		{D0359C69-6EA9-4B03-9455-90E8E04F1CB0} = {8C662D59-A3CB-466F-8E85-A8E6BA5E7601}
 	EndGlobalSection
 EndGlobal