JacobTech.com/Luski.Net
3
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev #1

Merged
JacobTech merged 14 commits from dev into stable 2024-11-18 23:39:55 -05:00
Conversation 0 Commits 14 Files Changed 77 +5 -3
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 97ed89b627 - Show all commits

4
Luski.net/Luski.net.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>disable</ImplicitUsings> <ImplicitUsings>disable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@ -13,7 +13,7 @@
<RepositoryUrl>https://github.com/JacobTech-com/Luski.net</RepositoryUrl> <RepositoryUrl>https://github.com/JacobTech-com/Luski.net</RepositoryUrl>
<IncludeSymbols>True</IncludeSymbols> <IncludeSymbols>True</IncludeSymbols>
<FileVersion>1.0.0</FileVersion> <FileVersion>1.0.0</FileVersion>
<Version>2.0.0-alpha24</Version> <Version>2.0.0-alpha25</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
Luski.net/Server.Storage.cs
View File

@ -288,6 +288,7 @@ public class ServerStorage
public Stream GetResourceStream(StorageDirectory Directory, string Resource) public Stream GetResourceStream(StorageDirectory Directory, string Resource)
{ {
return File.OpenRead(Location + Directories[(byte)Directory] + "/" + Resource);
byte[] buffer = new byte[16 * 1024]; byte[] buffer = new byte[16 * 1024];
MemoryStream ms = new(); MemoryStream ms = new();
using (FileStream r = File.OpenRead(Location + Directories[(byte)Directory] + "/" + Resource)) using (FileStream r = File.OpenRead(Location + Directories[(byte)Directory] + "/" + Resource))
@ -305,6 +306,7 @@ public class ServerStorage
public Stream GetResourceStream(string dir) public Stream GetResourceStream(string dir)
{ {
return File.OpenRead(dir);
byte[] buffer = new byte[16 * 1024]; byte[] buffer = new byte[16 * 1024];
MemoryStream ms = new(); MemoryStream ms = new();
using (FileStream r = File.OpenRead(dir)) using (FileStream r = File.OpenRead(dir))

2
Luski.net/Server.cs
View File

@ -30,7 +30,7 @@ public partial class Server
} }
internal bool Secure = true; internal bool Secure = true;
internal string wssurl; internal string wssurl { get; set; } = "";
public ServerEncryption EncryptionHandler { get; } public ServerEncryption EncryptionHandler { get; }
public ServerStorage Storage { get; } public ServerStorage Storage { get; }