✔ Fixed Redundant Console Output.

✔ Fixed Embedded Resource Updatability. ✔ Bumped All Projects To NETStandard 2.1.
Texnomic · May 31, 2020 · 86b63a1 · 86b63a1
1 parent 9f1c387
commit 86b63a1
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 40 deletions.
diff --git a/Texnomic.ENS.BaseRegistrar/Texnomic.ENS.BaseRegistrar.csproj b/Texnomic.ENS.BaseRegistrar/Texnomic.ENS.BaseRegistrar.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Texnomic.SecureDNS.Terminal/CLI.cs b/Texnomic.SecureDNS.Terminal/CLI.cs
@@ -6,8 +6,6 @@
 using Texnomic.DNS.Servers;
 using Texnomic.SecureDNS.Terminal.Options;
 
-using Console = Colorful.Console;
-
 namespace Texnomic.SecureDNS.Terminal
 {
     public class CLI : IHostedService, IDisposable
@@ -26,9 +24,6 @@ public CLI(IOptionsMonitor<TerminalOptions> TerminalOptions, ProxyServer ProxySe
 
         public async Task StartAsync(CancellationToken CancellationToken)
         {
-            Server.Started += (Sender, Args) => Console.WriteLine(" Server Started.\n\r");
-            Server.Stopped += (Sender, Args) => Console.WriteLine("\n\r Server Stopped.");
-
             await Server.StartAsync(CancellationToken);
         }
 

diff --git a/Texnomic.SecureDNS.Terminal/Program.cs b/Texnomic.SecureDNS.Terminal/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Colorful;
@@ -24,7 +25,6 @@
 using Texnomic.SecureDNS.Protocols;
 using Texnomic.SecureDNS.Terminal.Enums;
 using Texnomic.SecureDNS.Terminal.Options;
-using Texnomic.SecureDNS.Terminal.Properties;
 
 using Console = Colorful.Console;
 using Protocol = Texnomic.SecureDNS.Terminal.Enums.Protocol;
@@ -54,10 +54,26 @@ public static async Task Main(string[] Arguments)
             await HostBuilder.RunConsoleAsync();
         }
 
+        private static byte[] ReadResource(string Name)
+        {
+            var MainAssembly = Assembly.GetExecutingAssembly();
+
+            var ResourceName = MainAssembly.GetManifestResourceNames()
+                                        .Single(Resource => Resource.EndsWith(Name));
+
+            using var Stream = MainAssembly.GetManifestResourceStream(ResourceName);
+
+            var Buffer = new byte[Stream.Length];
+
+            Stream.Read(Buffer);
+
+            return Buffer;
+        }
+
         private static void BuildHost()
         {
             if(!File.Exists("AppSettings.json"))
-                File.WriteAllBytes("AppSettings.json", Resources.AppSettings);
+                File.WriteAllBytes("AppSettings.json", ReadResource("AppSettings.json"));
 
             HostBuilder = new HostBuilder()
                  .ConfigureAppConfiguration(ConfigureApp)
@@ -84,7 +100,7 @@ private static void Splash()
         {
             Console.Title = "Texnomic SecureDNS";
 
-            var Speed = new Figlet(FigletFont.Load(Resources.Speed));
+            var Speed = new Figlet(FigletFont.Load(ReadResource("Speed.flf")));
 
             Console.WriteWithGradient(Speed.ToAscii(" Texnomic").ConcreteValue.ToArray(), System.Drawing.Color.Yellow, System.Drawing.Color.Fuchsia, 14);
 
@@ -99,7 +115,7 @@ private static void ConfigureApp(HostBuilderContext HostBuilderContext, IConfigu
         }
         private static void ConfigureLogging(HostBuilderContext HostBuilderContext, ILoggingBuilder Logging)
         {
-            Logging.AddConsole();
+            //Logging.AddConsole();
         }
         private static void ConfigureLogger(HostBuilderContext HostBuilderContext, LoggerConfiguration LoggerConfiguration)
         {

diff --git a/Texnomic.SecureDNS.Terminal/Properties/Resources.Designer.cs b/Texnomic.SecureDNS.Terminal/Properties/Resources.Designer.cs
diff --git a/Texnomic.SecureDNS.Terminal/Properties/Resources.resx b/Texnomic.SecureDNS.Terminal/Properties/Resources.resx
@@ -117,11 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="AppSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\AppSettings.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="Speed" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Fonts\Speed.flf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
 </root>
diff --git a/Texnomic.SecureDNS.Terminal/Texnomic.SecureDNS.Terminal.csproj b/Texnomic.SecureDNS.Terminal/Texnomic.SecureDNS.Terminal.csproj
@@ -21,6 +21,16 @@
     <PackageId>Texnomic SecureDNS Terminal</PackageId>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="AppSettings.json" />
+    <None Remove="Fonts\Speed.flf" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="AppSettings.json" />
+    <EmbeddedResource Include="Fonts\Speed.flf" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Colorful.Console" Version="1.2.10" />
     <PackageReference Include="Destructurama.Attributed" Version="2.0.0" />
@@ -73,9 +83,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="AppSettings.json">
+    <Resource Include="AppSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </Resource>
   </ItemGroup>
 
 </Project>
diff --git a/Texnomic.Sodium/Texnomic.Sodium.csproj b/Texnomic.Sodium/Texnomic.Sodium.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>