vs_utils/Utils
1
0
Fork 0
Code Issues Pull Requests Releases 25 Wiki Activity

Refactoring and add net core project

Browse Source
This commit is contained in:
BlubbFish 2019-11-24 18:29:02 +01:00
parent 8606362ed7
commit 2b40c85203
15 changed files with 110 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Utils/CmdArgs.cs
View File

@ -113,10 +113,7 @@ namespace BlubbFish.Utils
/// Menge der angegebenen Komandozeilen-Argumente /// Menge der angegebenen Komandozeilen-Argumente
/// </summary> /// </summary>
/// <returns>Menge</returns> /// <returns>Menge</returns>
public Int32 GetArgsLength() public Int32 GetArgsLength() => this.argList.Count;
{
return this.argList.Count;
}
/// <summary> /// <summary>
/// Gibt zurück ob ein Argument angegeben wurde /// Gibt zurück ob ein Argument angegeben wurde

4
Utils/EventArgsHelper.cs
View File

@ -11,9 +11,7 @@ namespace BlubbFish.Utils {
} }
public class UpdaterFailEventArgs : EventArgs { public class UpdaterFailEventArgs : EventArgs {
public UpdaterFailEventArgs(Exception e) { public UpdaterFailEventArgs(Exception e) => this.Except = e;
this.Except = e;
}
public Exception Except { get; private set; } public Exception Except { get; private set; }
} }

13
Utils/FileLogger.cs
View File

@ -9,7 +9,7 @@ namespace BlubbFish.Utils
{ {
public class FileLogger public class FileLogger
{ {
private static Dictionary<String, FileLogger> instances = new Dictionary<String, FileLogger>(); private static readonly Dictionary<String, FileLogger> instances = new Dictionary<String, FileLogger>();
private static String logDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar; private static String logDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + Path.DirectorySeparatorChar;
private readonly StreamWriter file; private readonly StreamWriter file;
private FileLogger(String filename, Boolean append) private FileLogger(String filename, Boolean append)
@ -18,7 +18,7 @@ namespace BlubbFish.Utils
if (!File.Exists(filename)) { if (!File.Exists(filename)) {
String folder = Path.GetDirectoryName(Path.GetFullPath(filename)); String folder = Path.GetDirectoryName(Path.GetFullPath(filename));
if (!Directory.Exists(folder)) { if (!Directory.Exists(folder)) {
Directory.CreateDirectory(folder); _ = Directory.CreateDirectory(folder);
} }
} }
this.file = new StreamWriter(filename, append, Encoding.UTF8) { this.file = new StreamWriter(filename, append, Encoding.UTF8) {
@ -40,11 +40,11 @@ namespace BlubbFish.Utils
if (Directory.Exists(v)) { if (Directory.Exists(v)) {
logDir = v; logDir = v;
} else { } else {
Directory.CreateDirectory(v); _ = Directory.CreateDirectory(v);
logDir = v; logDir = v;
} }
if (logDir.Substring(logDir.Length - 1) != Path.DirectorySeparatorChar.ToString()) { if (logDir.Substring(logDir.Length - 1) != Path.DirectorySeparatorChar.ToString()) {
logDir = logDir + Path.DirectorySeparatorChar; logDir += Path.DirectorySeparatorChar;
} }
} }
@ -59,9 +59,6 @@ namespace BlubbFish.Utils
this.file.WriteLine(text); this.file.WriteLine(text);
this.file.Flush(); this.file.Flush();
} }
public void SetLine(String text, DateTime d) public void SetLine(String text, DateTime d) => this.SetLine(d.ToString("[yyyy-MM-dd HH:mm:ss.ffff] ") + text);
{
this.SetLine(d.ToString("[yyyy-MM-dd HH:mm:ss.ffff] ") + text);
}
} }
} }

8
Utils/FileMutex.cs
View File

@ -25,7 +25,9 @@ namespace BlubbFish.Utils
public void SetName(String name) public void SetName(String name)
{ {
String path = AppDomain.CurrentDomain.BaseDirectory; String path = AppDomain.CurrentDomain.BaseDirectory;
this.filename = path + String.Join(String.Empty, Array.ConvertAll(new SHA512Managed().ComputeHash(Encoding.UTF8.GetBytes(name)), b => b.ToString("X2"))) + ".lock.txt"; SHA512Managed sha = new SHA512Managed();
this.filename = path + String.Join(String.Empty, Array.ConvertAll(sha.ComputeHash(Encoding.UTF8.GetBytes(name)), b => b.ToString("X2"))) + ".lock.txt";
sha.Dispose();
} }
public Boolean Create() public Boolean Create()
@ -35,7 +37,7 @@ namespace BlubbFish.Utils
} }
this.file = new StreamWriter(this.filename); this.file = new StreamWriter(this.filename);
InitFile(); this.InitFile();
return File.Exists(this.filename) && this.file != null; return File.Exists(this.filename) && this.file != null;
} }
@ -64,7 +66,7 @@ namespace BlubbFish.Utils
} }
public void Dispose() { public void Dispose() {
Dispose(true); this.Dispose(true);
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
} }

30
Utils/Helper.cs
View File

@ -17,10 +17,7 @@ namespace BlubbFish.Utils {
public static Object GetProperty(this Object o, String name) { public static Object GetProperty(this Object o, String name) {
PropertyInfo prop = o.GetType().GetProperty(name); PropertyInfo prop = o.GetType().GetProperty(name);
if (prop.CanRead) { return prop.CanRead ? prop.GetValue(o) : null;
return prop.GetValue(o);
}
return null;
} }
public static void SetProperty(this Object o, String name, String value) { public static void SetProperty(this Object o, String name, String value) {
@ -57,36 +54,17 @@ namespace BlubbFish.Utils {
return false; return false;
} }
public static Boolean HasAbstract(this Type o, Type type) { public static Boolean HasAbstract(this Type o, Type type) => o.BaseType == type;
if (o.BaseType == type) {
return true;
}
return false;
}
#endregion #endregion
#region StringHelper #region StringHelper
public static String GetEnumDescription(Enum value) { public static String GetEnumDescription(Enum value) {
FieldInfo fi = value.GetType().GetField(value.ToString()); FieldInfo fi = value.GetType().GetField(value.ToString());
DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false); DescriptionAttribute[] attributes = (DescriptionAttribute[])fi.GetCustomAttributes(typeof(DescriptionAttribute), false);
return attributes != null && attributes.Length > 0 ? attributes[0].Description : value.ToString();
if (attributes != null && attributes.Length > 0) {
return attributes[0].Description;
} else {
return value.ToString();
}
} }
public static String ToUpperLower(this String s) { public static String ToUpperLower(this String s) => s.Length == 0 ? "" : s.Length == 1 ? s.ToUpper() : s[0].ToString().ToUpper() + s.Substring(1).ToLower();
if (s.Length == 0) {
return "";
}
if (s.Length == 1) {
return s.ToUpper();
}
return s[0].ToString().ToUpper() + s.Substring(1).ToLower();
}
public static void WriteError(String text) { public static void WriteError(String text) {
Console.ForegroundColor = ConsoleColor.Red; Console.ForegroundColor = ConsoleColor.Red;

47
Utils/InIReader.cs
View File

@ -10,15 +10,13 @@ namespace BlubbFish.Utils {
private Dictionary<String, Dictionary<String, String>> inifile; private Dictionary<String, Dictionary<String, String>> inifile;
private readonly FileSystemWatcher k; private readonly FileSystemWatcher k;
private readonly String filename; private readonly String filename;
private static List<String> search_path = new List<String>() { private static readonly List<String> search_path = new List<String>() {
Directory.GetCurrentDirectory() Directory.GetCurrentDirectory()
}; };
private static Dictionary<String, InIReader> instances = new Dictionary<String, InIReader>(); private static readonly Dictionary<String, InIReader> instances = new Dictionary<String, InIReader>();
public static void SetSearchPath(List<String> directorys) { public static void SetSearchPath(List<String> directorys) => search_path.AddRange(directorys);
search_path.AddRange(directorys);
}
public static Boolean ConfigExist(String filename) { public static Boolean ConfigExist(String filename) {
foreach (String path in search_path) { foreach (String path in search_path) {
@ -54,7 +52,7 @@ namespace BlubbFish.Utils {
throw new ArgumentException(filename + " not found!"); throw new ArgumentException(filename + " not found!");
} }
this.k.Changed += new FileSystemEventHandler(this.ReadAgain); this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
LoadFile(); this.LoadFile();
} }
/// <summary> /// <summary>
@ -70,10 +68,7 @@ namespace BlubbFish.Utils {
return instances[filename]; return instances[filename];
} }
private void ReadAgain(Object sender, EventArgs e) private void ReadAgain(Object sender, EventArgs e) => this.LoadFile();
{
this.LoadFile();
}
private void LoadFile() private void LoadFile()
{ {
@ -123,7 +118,7 @@ namespace BlubbFish.Utils {
} else { } else {
List<String> ret = new List<String>(); List<String> ret = new List<String>();
foreach (String item in this.inifile.Keys) { foreach (String item in this.inifile.Keys) {
ret.Add(item.Substring(1, item.Length - 2)); ret.Add(item[1..^1]);
} }
return ret; return ret;
} }
@ -147,15 +142,9 @@ namespace BlubbFish.Utils {
this.Changed(); this.Changed();
} }
public Dictionary<String, String> GetSection(String section) { public Dictionary<String, String> GetSection(String section) => this.inifile.Keys.Contains(section) ?
if(this.inifile.Keys.Contains(section)) { this.inifile[section] : this.inifile.Keys.Contains("[" + section + "]") ?
return this.inifile[section]; this.inifile["[" + section + "]"] : new Dictionary<String, String>();
}
if(this.inifile.Keys.Contains("["+section+"]")) {
return this.inifile["[" + section + "]"];
}
return new Dictionary<String, String>();
}
/// <summary> /// <summary>
/// Gibt einen einzelnen Wert zurück /// Gibt einen einzelnen Wert zurück
@ -168,12 +157,7 @@ namespace BlubbFish.Utils {
if (!section.StartsWith("[")) { if (!section.StartsWith("[")) {
section = "[" + section + "]"; section = "[" + section + "]";
} }
if (this.inifile.Keys.Contains(section)) { return this.inifile.Keys.Contains(section) && this.inifile[section].Keys.Contains(key) ? this.inifile[section][key] : null;
if (this.inifile[section].Keys.Contains(key)) {
return this.inifile[section][key];
}
}
return null;
} }
/// <summary> /// <summary>
@ -205,8 +189,8 @@ namespace BlubbFish.Utils {
private void Changed() private void Changed()
{ {
this.k.Changed -= null; this.k.Changed -= null;
SaveSettings(); this.SaveSettings();
LoadFile(); this.LoadFile();
this.k.Changed += new FileSystemEventHandler(this.ReadAgain); this.k.Changed += new FileSystemEventHandler(this.ReadAgain);
} }
@ -215,7 +199,7 @@ namespace BlubbFish.Utils {
StreamWriter file = new StreamWriter(this.filename); StreamWriter file = new StreamWriter(this.filename);
file.BaseStream.SetLength(0); file.BaseStream.SetLength(0);
file.BaseStream.Flush(); file.BaseStream.Flush();
file.BaseStream.Seek(0, SeekOrigin.Begin); _ = file.BaseStream.Seek(0, SeekOrigin.Begin);
foreach (KeyValuePair<String, Dictionary<String, String>> cap in this.inifile) { foreach (KeyValuePair<String, Dictionary<String, String>> cap in this.inifile) {
file.WriteLine(cap.Key); file.WriteLine(cap.Key);
foreach (KeyValuePair<String, String> sub in cap.Value) { foreach (KeyValuePair<String, String> sub in cap.Value) {
@ -258,10 +242,11 @@ namespace BlubbFish.Utils {
if (!this.inifile.Keys.Contains(name)) { if (!this.inifile.Keys.Contains(name)) {
return false; return false;
} }
this.inifile.Remove(name); _ = this.inifile.Remove(name);
this.Changed(); this.Changed();
return false; return false;
} }
protected virtual void Dispose(Boolean disposing) { protected virtual void Dispose(Boolean disposing) {
if (disposing) { if (disposing) {
this.k.Dispose(); this.k.Dispose();
@ -269,7 +254,7 @@ namespace BlubbFish.Utils {
} }
public void Dispose() { public void Dispose() {
Dispose(true); this.Dispose(true);
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
} }

15
Utils/OwnController.cs
View File

@ -1,21 +1,10 @@
using System; namespace BlubbFish.Utils {
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace BlubbFish.Utils
{
public abstract class OwnController public abstract class OwnController
{ {
/// <summary> /// <summary>
/// Führt den Controller aus. /// Führt den Controller aus.
/// </summary> /// </summary>
public void Execute() public void Execute() => this.Init();
{
this.Init();
}
abstract protected void Init(); abstract protected void Init();
abstract public void Dispose(); abstract public void Dispose();
} }

29
Utils/OwnModel.cs
View File

@ -1,25 +1,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BlubbFish.Utils namespace BlubbFish.Utils {
{
public abstract class OwnModel<T> where T : class public abstract class OwnModel<T> where T : class
{ {
private static readonly Lazy<T> _instance = new Lazy<T>(() => CreateInstanceOfT()); private static readonly Lazy<T> _instance = new Lazy<T>(() => CreateInstanceOfT());
private readonly List<OwnView> observer = new List<OwnView>(); private readonly List<OwnView> observer = new List<OwnView>();
public static T Instance public static T Instance => _instance.Value;
{ private static T CreateInstanceOfT() => Activator.CreateInstance(typeof(T), true) as T;
get {
return _instance.Value;
}
}
private static T CreateInstanceOfT()
{
return Activator.CreateInstance(typeof(T), true) as T;
}
public void SetObserver(OwnView view) public void SetObserver(OwnView view)
{ {
@ -27,13 +15,10 @@ namespace BlubbFish.Utils
view.Update(); view.Update();
} }
public void RemoveObserver(OwnView view) { public void RemoveObserver(OwnView view) => _ = this.observer.Remove(view);
this.observer.Remove(view); protected void Update() => this.observer.ForEach(delegate (OwnView view) {
} view.Update();
protected void Update() });
{
this.observer.ForEach(delegate (OwnView view) { view.Update(); });
}
abstract protected void Init(); abstract protected void Init();
abstract public void Dispose(); abstract public void Dispose();
} }

35
Utils/OwnObject.cs
View File

@ -21,21 +21,17 @@ namespace BlubbFish.Utils
/// Formates a LogMessage to a String /// Formates a LogMessage to a String
/// </summary> /// </summary>
/// <returns>Formated String</returns> /// <returns>Formated String</returns>
public override String ToString() { public override String ToString() => "[" + this.Date.ToString("R") + "]: " + this.Level.ToString() + " " + this.Location + ", " + this.Message;
return "[" + this.Date.ToString("R") + "]: " + this.Level.ToString() + " "+ this.Location + ", " + this.Message;
}
/// <summary> /// <summary>
/// Formates a LogMessage to a String /// Formates a LogMessage to a String
/// </summary> /// </summary>
/// <param name="classNames">Enables the output of the location</param> /// <param name="classNames">Enables the output of the location</param>
/// <param name="timeStamps">Enables the output of the date</param> /// <param name="timeStamps">Enables the output of the date</param>
/// <returns>Formated String</returns> /// <returns>Formated String</returns>
public String ToString(Boolean classNames, Boolean timeStamps) { public String ToString(Boolean classNames, Boolean timeStamps) => (timeStamps ? "[" + this.Date.ToString("R") + "]: " + this.Level.ToString() + " " : "") + (classNames ? this.Location + ", " : "") + this.Message;
return (timeStamps ? "[" + this.Date.ToString("R") + "]: " + this.Level.ToString() + " " : "") + (classNames ? this.Location + ", " : "") + this.Message;
}
} }
private List<LogObject> loglist = new List<LogObject>(); private readonly List<LogObject> loglist = new List<LogObject>();
public delegate void LogEvent(Object sender, LogEventArgs e); public delegate void LogEvent(Object sender, LogEventArgs e);
public enum LogLevel : Int32 { public enum LogLevel : Int32 {
@ -72,10 +68,7 @@ namespace BlubbFish.Utils
/// <param name="location">Where the event arrives</param> /// <param name="location">Where the event arrives</param>
/// <param name="message">The logmessage itselfs</param> /// <param name="message">The logmessage itselfs</param>
/// <param name="level">Level of the message</param> /// <param name="level">Level of the message</param>
protected void AddLog(String location, String message, LogLevel level) protected void AddLog(String location, String message, LogLevel level) => this.AddLog(location, message, level, DateTime.Now);
{
this.AddLog(location, message, level, DateTime.Now);
}
/// <summary> /// <summary>
/// Put a message in the log /// Put a message in the log
@ -87,20 +80,20 @@ namespace BlubbFish.Utils
protected void AddLog(String location, String message, LogLevel level, DateTime date) protected void AddLog(String location, String message, LogLevel level, DateTime date)
{ {
LogEventArgs e = new LogEventArgs(location, message, level, date); LogEventArgs e = new LogEventArgs(location, message, level, date);
if (EventDebug != null && level >= LogLevel.Debug) { if (level >= LogLevel.Debug) {
EventDebug(this, e); EventDebug?.Invoke(this, e);
} }
if (EventNotice != null && level >= LogLevel.Notice) { if (level >= LogLevel.Notice) {
EventNotice(this, e); EventNotice?.Invoke(this, e);
} }
if (EventInfo != null && level >= LogLevel.Info) { if (level >= LogLevel.Info) {
EventInfo(this, e); EventInfo?.Invoke(this, e);
} }
if (EventWarn != null && level >= LogLevel.Warn) { if (level >= LogLevel.Warn) {
EventWarn(this, e); EventWarn?.Invoke(this, e);
} }
if (EventError != null && level >= LogLevel.Error) { if (level >= LogLevel.Error) {
EventError(this, e); EventError?.Invoke(this, e);
} }
EventLog?.Invoke(this, e); EventLog?.Invoke(this, e);

8
Utils/OwnView.cs
View File

@ -1,10 +1,4 @@
using System; namespace BlubbFish.Utils {
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BlubbFish.Utils {
public abstract class OwnView { public abstract class OwnView {
protected OwnView() { } protected OwnView() { }

37
Utils/ProgramLogger.cs
View File

@ -1,8 +1,5 @@
using System; using System;
using System.IO; using System.IO;
using System.Reflection;
using System.Security;
using System.Security.Permissions;
using System.Text; using System.Text;
namespace BlubbFish.Utils { namespace BlubbFish.Utils {
@ -35,17 +32,10 @@ namespace BlubbFish.Utils {
} }
private Boolean IsWritable(String filename) { private Boolean IsWritable(String filename) {
FileIOPermission writePermission = new FileIOPermission(FileIOPermissionAccess.Write, filename);
PermissionSet p = new PermissionSet(PermissionState.None);
p.AddPermission(writePermission);
if (!p.IsSubsetOf(AppDomain.CurrentDomain.PermissionSet)) {
return false;
}
try { try {
using (FileStream fstream = new FileStream(filename, FileMode.Append)) using FileStream fstream = new FileStream(filename, FileMode.Append);
using (TextWriter writer = new StreamWriter(fstream)) { using TextWriter writer = new StreamWriter(fstream);
writer.Write(""); writer.Write("");
}
} catch (UnauthorizedAccessException) { } catch (UnauthorizedAccessException) {
return false; return false;
} }
@ -91,11 +81,11 @@ namespace BlubbFish.Utils {
public FileWriter(String path) : base(path) { public FileWriter(String path) : base(path) {
} }
public override Encoding Encoding { get { return Encoding.UTF8; } } public override Encoding Encoding => Encoding.UTF8;
public override Boolean AutoFlush { get { return true; } set { base.AutoFlush = value; } } public override Boolean AutoFlush { get => true; set => base.AutoFlush = value; }
private void Write(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) { private void Write(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) {
String text = ""; String text;
if (this.newline) { if (this.newline) {
text = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value; text = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value;
this.newline = false; this.newline = false;
@ -108,25 +98,16 @@ namespace BlubbFish.Utils {
} }
private void WriteLine(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) { private void WriteLine(String value, TextWriter origstream, ConsoleWriterEventArgs.ConsoleType type) {
String text = ""; String text = this.newline ? "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value : value;
if (this.newline) {
text = "[" + DateTime.Now.ToString("o") + "]-" + type.ToString() + ": " + value;
} else {
text = value;
}
this.newline = true; this.newline = true;
origstream.WriteLine(text); origstream.WriteLine(text);
base.WriteLine(text); base.WriteLine(text);
base.Flush(); base.Flush();
} }
internal void Write(Object sender, ConsoleWriterEventArgs e) { internal void Write(Object sender, ConsoleWriterEventArgs e) => this.Write(e.Value, e.Writer, e.StreamType);
this.Write(e.Value, e.Writer, e.StreamType);
}
internal void WriteLine(Object sender, ConsoleWriterEventArgs e) { internal void WriteLine(Object sender, ConsoleWriterEventArgs e) => this.WriteLine(e.Value, e.Writer, e.StreamType);
this.WriteLine(e.Value, e.Writer, e.StreamType);
}
} }
internal class ConsoleWriterEventArgs : EventArgs { internal class ConsoleWriterEventArgs : EventArgs {
@ -155,7 +136,7 @@ namespace BlubbFish.Utils {
this.streamtype = type; this.streamtype = type;
} }
public override Encoding Encoding { get { return Encoding.UTF8; } } public override Encoding Encoding => Encoding.UTF8;
public override void Write(String value) { public override void Write(String value) {
this.WriteEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype)); this.WriteEvent?.Invoke(this, new ConsoleWriterEventArgs(value, this.stream, this.streamtype));
base.Write(value); base.Write(value);

9
Utils/Properties/AssemblyInfo.cs
View File

@ -1,18 +1,19 @@
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices; using System.Resources;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden // Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind. // die mit einer Assembly verknüpft sind.
[assembly: AssemblyTitle("Utils")] [assembly: AssemblyTitle("Utils")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("Provides useful classes for other projects")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("BlubbFish")]
[assembly: AssemblyProduct("Utils")] [assembly: AssemblyProduct("Utils")]
[assembly: AssemblyCopyright("Copyright © 2014 - 02.10.2018")] [assembly: AssemblyCopyright("Copyright © 2014 - 02.10.2018")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("BlubbFish")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("de-DE")]
// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar // Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von // für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von

7
Utils/Updater.cs
View File

@ -58,7 +58,7 @@ namespace BlubbFish.Utils {
while (this.t.ThreadState == ThreadState.Running) { } while (this.t.ThreadState == ThreadState.Running) { }
if(exceuteUpdate) { if(exceuteUpdate) {
if(File.Exists("update.bat")) { if(File.Exists("update.bat")) {
System.Diagnostics.Process.Start("update.bat"); _ = System.Diagnostics.Process.Start("update.bat");
} }
} }
} }
@ -90,6 +90,7 @@ namespace BlubbFish.Utils {
xml.Flush(); xml.Flush();
file.Flush(); file.Flush();
file.Close(); file.Close();
xml.Close();
} }
/// <summary> /// <summary>
@ -114,7 +115,9 @@ namespace BlubbFish.Utils {
Thread.Sleep(1000); Thread.Sleep(1000);
try { try {
Stream stream = WebRequest.Create(this.url + "version.xml").GetResponse().GetResponseStream(); Stream stream = WebRequest.Create(this.url + "version.xml").GetResponse().GetResponseStream();
String content = new StreamReader(stream).ReadToEnd(); StreamReader sr = new StreamReader(stream);
String content = sr.ReadToEnd();
sr.Close();
Boolean update = false; Boolean update = false;
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.LoadXml(content); doc.LoadXml(content);

9
Utils/Utils_Core.csproj Normal file
View File

@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<AssemblyName>Utils</AssemblyName>
<RootNamespace>BlubbFish.Utils</RootNamespace>
</PropertyGroup>
</Project>

25
Utils_Core.sln Normal file
View File

@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29215.179
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "Utils\Utils_Core.csproj", "{A289C67C-BC49-46A0-8657-B444C605079E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A289C67C-BC49-46A0-8657-B444C605079E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A289C67C-BC49-46A0-8657-B444C605079E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A289C67C-BC49-46A0-8657-B444C605079E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A289C67C-BC49-46A0-8657-B444C605079E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A7224DC4-69F1-4273-BE78-3D9DC80A28C5}
EndGlobalSection
EndGlobal