Skip to content

Commit 86b63a1

Browse files
committed
✔ Fixed Redundant Console Output.
✔ Fixed Embedded Resource Updatability. ✔ Bumped All Projects To NETStandard 2.1.
1 parent 9f1c387 commit 86b63a1

File tree

7 files changed

+34
-40
lines changed

7 files changed

+34
-40
lines changed

Texnomic.ENS.BaseRegistrar/Texnomic.ENS.BaseRegistrar.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

Texnomic.SecureDNS.Terminal/CLI.cs

-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
using Texnomic.DNS.Servers;
77
using Texnomic.SecureDNS.Terminal.Options;
88

9-
using Console = Colorful.Console;
10-
119
namespace Texnomic.SecureDNS.Terminal
1210
{
1311
public class CLI : IHostedService, IDisposable
@@ -26,9 +24,6 @@ public CLI(IOptionsMonitor<TerminalOptions> TerminalOptions, ProxyServer ProxySe
2624

2725
public async Task StartAsync(CancellationToken CancellationToken)
2826
{
29-
Server.Started += (Sender, Args) => Console.WriteLine(" Server Started.\n\r");
30-
Server.Stopped += (Sender, Args) => Console.WriteLine("\n\r Server Stopped.");
31-
3227
await Server.StartAsync(CancellationToken);
3328
}
3429

Texnomic.SecureDNS.Terminal/Program.cs

+20-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.IO;
33
using System.Linq;
4+
using System.Reflection;
45
using System.Runtime.InteropServices;
56
using System.Threading.Tasks;
67
using Colorful;
@@ -24,7 +25,6 @@
2425
using Texnomic.SecureDNS.Protocols;
2526
using Texnomic.SecureDNS.Terminal.Enums;
2627
using Texnomic.SecureDNS.Terminal.Options;
27-
using Texnomic.SecureDNS.Terminal.Properties;
2828

2929
using Console = Colorful.Console;
3030
using Protocol = Texnomic.SecureDNS.Terminal.Enums.Protocol;
@@ -54,10 +54,26 @@ public static async Task Main(string[] Arguments)
5454
await HostBuilder.RunConsoleAsync();
5555
}
5656

57+
private static byte[] ReadResource(string Name)
58+
{
59+
var MainAssembly = Assembly.GetExecutingAssembly();
60+
61+
var ResourceName = MainAssembly.GetManifestResourceNames()
62+
.Single(Resource => Resource.EndsWith(Name));
63+
64+
using var Stream = MainAssembly.GetManifestResourceStream(ResourceName);
65+
66+
var Buffer = new byte[Stream.Length];
67+
68+
Stream.Read(Buffer);
69+
70+
return Buffer;
71+
}
72+
5773
private static void BuildHost()
5874
{
5975
if(!File.Exists("AppSettings.json"))
60-
File.WriteAllBytes("AppSettings.json", Resources.AppSettings);
76+
File.WriteAllBytes("AppSettings.json", ReadResource("AppSettings.json"));
6177

6278
HostBuilder = new HostBuilder()
6379
.ConfigureAppConfiguration(ConfigureApp)
@@ -84,7 +100,7 @@ private static void Splash()
84100
{
85101
Console.Title = "Texnomic SecureDNS";
86102

87-
var Speed = new Figlet(FigletFont.Load(Resources.Speed));
103+
var Speed = new Figlet(FigletFont.Load(ReadResource("Speed.flf")));
88104

89105
Console.WriteWithGradient(Speed.ToAscii(" Texnomic").ConcreteValue.ToArray(), System.Drawing.Color.Yellow, System.Drawing.Color.Fuchsia, 14);
90106

@@ -99,7 +115,7 @@ private static void ConfigureApp(HostBuilderContext HostBuilderContext, IConfigu
99115
}
100116
private static void ConfigureLogging(HostBuilderContext HostBuilderContext, ILoggingBuilder Logging)
101117
{
102-
Logging.AddConsole();
118+
//Logging.AddConsole();
103119
}
104120
private static void ConfigureLogger(HostBuilderContext HostBuilderContext, LoggerConfiguration LoggerConfiguration)
105121
{

Texnomic.SecureDNS.Terminal/Properties/Resources.Designer.cs

-20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Texnomic.SecureDNS.Terminal/Properties/Resources.resx

-7
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,4 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121-
<data name="AppSettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>..\AppSettings.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
123-
</data>
124-
<data name="Speed" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>..\Fonts\Speed.flf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
126-
</data>
127120
</root>

Texnomic.SecureDNS.Terminal/Texnomic.SecureDNS.Terminal.csproj

+12-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@
2121
<PackageId>Texnomic SecureDNS Terminal</PackageId>
2222
</PropertyGroup>
2323

24+
<ItemGroup>
25+
<None Remove="AppSettings.json" />
26+
<None Remove="Fonts\Speed.flf" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<EmbeddedResource Include="AppSettings.json" />
31+
<EmbeddedResource Include="Fonts\Speed.flf" />
32+
</ItemGroup>
33+
2434
<ItemGroup>
2535
<PackageReference Include="Colorful.Console" Version="1.2.10" />
2636
<PackageReference Include="Destructurama.Attributed" Version="2.0.0" />
@@ -73,9 +83,9 @@
7383
</ItemGroup>
7484

7585
<ItemGroup>
76-
<None Update="AppSettings.json">
86+
<Resource Include="AppSettings.json">
7787
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
78-
</None>
88+
</Resource>
7989
</ItemGroup>
8090

8191
</Project>

Texnomic.Sodium/Texnomic.Sodium.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)