More easing the dependency graph

Sean McBeth · Sean McBeth · commit 52b0619ea180 · 2023-12-04T14:31:45.000-05:00
diff --git a/src/Juniper.HTTP/Juniper.HTTP.csproj b/src/Juniper.HTTP/Juniper.HTTP.csproj
@@ -33,7 +33,6 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="..\Juniper.IO\Juniper.IO.csproj" />
-	  <ProjectReference Include="..\Juniper.MediaType\Juniper.MediaType.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/Juniper.Logging/IErrorSource.cs b/src/Juniper.Logging/IErrorSource.cs
diff --git a/src/Juniper.Logging/IInfoSource.cs b/src/Juniper.Logging/IInfoSource.cs
diff --git a/src/Juniper.Logging/ILoggingSource.cs b/src/Juniper.Logging/ILoggingSource.cs
diff --git a/src/Juniper.Logging/IWarningSource.cs b/src/Juniper.Logging/IWarningSource.cs
diff --git a/src/Juniper.Processes/ILoggingSource.cs b/src/Juniper.Processes/ILoggingSource.cs
@@ -0,0 +1,8 @@
+namespace Juniper.Logging;
+
+public interface ILoggingSource 
+{
+    event EventHandler<ErrorEventArgs> Err;
+    event EventHandler<StringEventArgs> Info;
+    event EventHandler<StringEventArgs> Warning;
+}
diff --git a/src/Juniper.Processes/Juniper.Processes.csproj b/src/Juniper.Processes/Juniper.Processes.csproj
@@ -33,7 +33,6 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="..\Juniper.IO\Juniper.IO.csproj" />
-	  <ProjectReference Include="..\Juniper.Logging\Juniper.Logging.csproj" />
 	  <ProjectReference Include="..\Juniper.MediaType\Juniper.MediaType.csproj" />
 	</ItemGroup>
 
diff --git a/src/Juniper.Server.WebRTC/AbstractWebRTCHub.cs b/src/Juniper.Server.WebRTC/AbstractWebRTCHub.cs
@@ -5,7 +5,9 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace Juniper.WebRTC;
+using Juniper.WebRTC;
+
+namespace Juniper.Server.WebRTC;
 
 public abstract class AbstractWebRTCHub<ClientT> : Hub<ClientT>, IWebRTCHubServer
     where ClientT : class, IWebRTCHubClient
diff --git a/src/Juniper.Server.WebRTC/IWebRTCHubClient.cs b/src/Juniper.Server.WebRTC/IWebRTCHubClient.cs
@@ -1,4 +1,4 @@
-﻿namespace Juniper.WebRTC;
+﻿namespace Juniper.Server.WebRTC;
 
 public interface IWebRTCHubClient
 {
diff --git a/src/Juniper.Server.WebRTC/IWebRTCHubServer.cs b/src/Juniper.Server.WebRTC/IWebRTCHubServer.cs
@@ -1,4 +1,4 @@
-namespace Juniper.WebRTC;
+namespace Juniper.Server.WebRTC;
 
 public interface IWebRTCHubServer
 {
diff --git a/src/Juniper.Server.WebRTC/Juniper.Server.WebRTC.csproj b/src/Juniper.Server.WebRTC/Juniper.Server.WebRTC.csproj
@@ -1,22 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<AssemblyName>Juniper.Logging</AssemblyName>
-		<RootNamespace>Juniper.Logging</RootNamespace>
-		<PackageId>SeanMcBeth.Juniper.Logging</PackageId>
+		<AssemblyName>Juniper.Server.WebRTC</AssemblyName>
+		<RootNamespace>Juniper.Server.WebRTC</RootNamespace>
+		<PackageId>SeanMcBeth.Juniper.Server.Server.WebRTC</PackageId>
 		<OutputType>Library</OutputType>
 		<TargetFramework>net7.0</TargetFramework>
 		<Authors>Sean T. McBeth</Authors>
 		<Copyright>Copyright © Sean T. McBeth 2019</Copyright>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
 		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-		<Description>General purpose code</Description>
+		<Description>General purpose server code</Description>
 		<PackageProjectUrl>https://github.com/capnmidnight/Juniper</PackageProjectUrl>
 		<PackageIcon>logo_juniper.min.png</PackageIcon>
 		<RepositoryUrl>https://github.com/capnmidnight/Juniper</RepositoryUrl>
 		<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
-		<ImplicitUsings>enable</ImplicitUsings>
+		<IsPackable>True</IsPackable>
 		<Platforms>AnyCPU;x64</Platforms>
-		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -28,6 +29,15 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\Juniper.Root\Juniper.Root.csproj" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.14" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.14" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.14" />
+		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
 	</ItemGroup>
-</Project>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\Juniper.WebRTC\Juniper.WebRTC.csproj" />
+	</ItemGroup>
+
+</Project>
diff --git a/src/Juniper.Server/Juniper.Server.csproj b/src/Juniper.Server/Juniper.Server.csproj
@@ -39,7 +39,6 @@
 	<ItemGroup>
 	  <ProjectReference Include="..\Juniper.Data\Juniper.Data.csproj" />
 	  <ProjectReference Include="..\Juniper.HTTP\Juniper.HTTP.csproj" />
-	  <ProjectReference Include="..\Juniper.WebRTC\Juniper.WebRTC.csproj" />
 	</ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Juniper.WebRTC;`
	`1`	`+namespace Juniper.Server.WebRTC;`
`2`	`2`
`3`	`3`	`public interface IWebRTCHubClient`
`4`	`4`	`{`