diff --git a/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj b/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj index 9741f26..22032fe 100644 --- a/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj +++ b/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj @@ -48,8 +48,8 @@ - - + + diff --git a/Pilz.Updating.Administration/My Project/Application.Designer.cs b/Pilz.Updating.Administration/My Project/Application.Designer.cs deleted file mode 100644 index 2be760e..0000000 --- a/Pilz.Updating.Administration/My Project/Application.Designer.cs +++ /dev/null @@ -1,11 +0,0 @@ -// ------------------------------------------------------------------------------ -// -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 -// -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. -// -// ------------------------------------------------------------------------------ - - diff --git a/Pilz.Updating.Administration/My Project/Application.myapp b/Pilz.Updating.Administration/My Project/Application.myapp deleted file mode 100644 index 758895d..0000000 --- a/Pilz.Updating.Administration/My Project/Application.myapp +++ /dev/null @@ -1,10 +0,0 @@ - - - false - false - 0 - true - 0 - 1 - true - diff --git a/Pilz.Updating.Administration/My Project/MyNamespace.Static.1.Designer.cs b/Pilz.Updating.Administration/My Project/MyNamespace.Static.1.Designer.cs deleted file mode 100644 index fddd658..0000000 --- a/Pilz.Updating.Administration/My Project/MyNamespace.Static.1.Designer.cs +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Diagnostics; -using Microsoft.VisualBasic; - -/* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia */ - /* TODO ERROR: Skipped DefineDirectiveTrivia *//* TODO ERROR: Skipped DefineDirectiveTrivia *//* TODO ERROR: Skipped DefineDirectiveTrivia *//* TODO ERROR: Skipped DefineDirectiveTrivia */ - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ -namespace Pilz.Updating.My -{ - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.CodeDom.Compiler.GeneratedCode("MyTemplate", "11.0.0.0")] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia */ - internal partial class MyApplication : Microsoft.VisualBasic.ApplicationServices.ApplicationBase - { - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - } - - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.CodeDom.Compiler.GeneratedCode("MyTemplate", "11.0.0.0")] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - internal partial class MyComputer : Microsoft.VisualBasic.Devices.Computer - { - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - [DebuggerHidden()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public MyComputer() : base() - { - } - } - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - [HideModuleName()] - [System.CodeDom.Compiler.GeneratedCode("MyTemplate", "11.0.0.0")] - internal static class MyProject - { - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.Computer")] - internal static MyComputer Computer - { - [DebuggerHidden()] - get - { - return m_ComputerObjectProvider.GetInstance; - } - } - - private readonly static ThreadSafeObjectProvider m_ComputerObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.Application")] - internal static MyApplication Application - { - [DebuggerHidden()] - get - { - return m_AppObjectProvider.GetInstance; - } - } - - private readonly static ThreadSafeObjectProvider m_AppObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.User")] - internal static Microsoft.VisualBasic.ApplicationServices.User User - { - [DebuggerHidden()] - get - { - return m_UserObjectProvider.GetInstance; - } - } - - private readonly static ThreadSafeObjectProvider m_UserObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.WebServices")] - internal static MyWebServices WebServices - { - [DebuggerHidden()] - get - { - return m_MyWebServicesObjectProvider.GetInstance; - } - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [MyGroupCollection("System.Web.Services.Protocols.SoapHttpClientProtocol", "Create__Instance__", "Dispose__Instance__", "")] - internal sealed class MyWebServices - { - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - public override bool Equals(object o) - { - return base.Equals(o); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - public override int GetHashCode() - { - return base.GetHashCode(); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - internal new Type GetType() - { - return typeof(MyWebServices); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - public override string ToString() - { - return base.ToString(); - } - - [DebuggerHidden()] - private static T Create__Instance__(T instance) where T : new() - { - if (instance == null) - { - return new T(); - } - else - { - return instance; - } - } - - [DebuggerHidden()] - private void Dispose__Instance__(ref T instance) - { - instance = default; - } - - [DebuggerHidden()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public MyWebServices() : base() - { - } - } - - private readonly static ThreadSafeObjectProvider m_MyWebServicesObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [System.Runtime.InteropServices.ComVisible(false)] - internal sealed class ThreadSafeObjectProvider where T : new() - { - internal T GetInstance - { - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [DebuggerHidden()] - get - { - var Value = m_Context.Value; - if (Value == null) - { - Value = new T(); - m_Context.Value = Value; - } - - return Value; - } - /* TODO ERROR: Skipped ElseDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - } - - [DebuggerHidden()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public ThreadSafeObjectProvider() : base() - { - } - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - private readonly Microsoft.VisualBasic.MyServices.Internal.ContextValue m_Context = new Microsoft.VisualBasic.MyServices.Internal.ContextValue(); - /* TODO ERROR: Skipped ElseDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - } - } -} -/* TODO ERROR: Skipped EndIfDirectiveTrivia */ diff --git a/Pilz.Updating.Administration/My Project/MyNamespace.Static.2.Designer.cs b/Pilz.Updating.Administration/My Project/MyNamespace.Static.2.Designer.cs deleted file mode 100644 index 056f982..0000000 --- a/Pilz.Updating.Administration/My Project/MyNamespace.Static.2.Designer.cs +++ /dev/null @@ -1,253 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -// See Compiler::LoadXmlSolutionExtension -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.Diagnostics; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualBasic; -using Microsoft.VisualBasic.CompilerServices; - -namespace Pilz.Updating.My -{ - [Embedded()] - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal sealed class InternalXmlHelper - { - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - private InternalXmlHelper() - { - } - - public static string get_Value(IEnumerable source) - { - foreach (XElement item in source) - return item.Value; - return null; - } - - public static void set_Value(IEnumerable source, string value) - { - foreach (XElement item in source) - { - item.Value = value; - break; - } - } - - public static string get_AttributeValue(IEnumerable source, XName name) - { - foreach (XElement item in source) - return Conversions.ToString(item.Attribute(name)); - return null; - } - - public static void set_AttributeValue(IEnumerable source, XName name, string value) - { - foreach (XElement item in source) - { - item.SetAttributeValue(name, value); - break; - } - } - - public static string get_AttributeValue(XElement source, XName name) - { - return Conversions.ToString(source.Attribute(name)); - } - - public static void set_AttributeValue(XElement source, XName name, string value) - { - source.SetAttributeValue(name, value); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static XAttribute CreateAttribute(XName name, object value) - { - if (value is null) - { - return null; - } - - return new XAttribute(name, value); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static XAttribute CreateNamespaceAttribute(XName name, XNamespace ns) - { - var a = new XAttribute(name, ns.NamespaceName); - a.AddAnnotation(ns); - return a; - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static object RemoveNamespaceAttributes(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes, object obj) - { - if (obj is object) - { - XElement elem = obj as XElement; - if (elem is object) - { - return RemoveNamespaceAttributes(inScopePrefixes, inScopeNs, attributes, elem); - } - else - { - IEnumerable elems = obj as IEnumerable; - if (elems is object) - { - return RemoveNamespaceAttributes(inScopePrefixes, inScopeNs, attributes, elems); - } - } - } - - return obj; - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static IEnumerable RemoveNamespaceAttributes(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes, IEnumerable obj) - { - if (obj is object) - { - IEnumerable elems = obj as IEnumerable; - if (elems is object) - { - return elems.Select(new RemoveNamespaceAttributesClosure(inScopePrefixes, inScopeNs, attributes).ProcessXElement); - } - else - { - return obj.Cast().Select(new RemoveNamespaceAttributesClosure(inScopePrefixes, inScopeNs, attributes).ProcessObject); - } - } - - return obj; - } - - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - private sealed class RemoveNamespaceAttributesClosure - { - private readonly string[] m_inScopePrefixes; - private readonly XNamespace[] m_inScopeNs; - private readonly List m_attributes; - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal RemoveNamespaceAttributesClosure(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes) - { - m_inScopePrefixes = inScopePrefixes; - m_inScopeNs = inScopeNs; - m_attributes = attributes; - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal XElement ProcessXElement(XElement elem) - { - return RemoveNamespaceAttributes(m_inScopePrefixes, m_inScopeNs, m_attributes, elem); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal object ProcessObject(object obj) - { - XElement elem = obj as XElement; - if (elem is object) - { - return RemoveNamespaceAttributes(m_inScopePrefixes, m_inScopeNs, m_attributes, elem); - } - else - { - return obj; - } - } - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static XElement RemoveNamespaceAttributes(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes, XElement e) - { - if (e is object) - { - var a = e.FirstAttribute; - while (a is object) - { - var nextA = a.NextAttribute; - if (a.IsNamespaceDeclaration) - { - var ns = a.Annotation(); - string prefix = a.Name.LocalName; - if (ns is object) - { - if (inScopePrefixes is object && inScopeNs is object) - { - int lastIndex = inScopePrefixes.Length - 1; - for (int i = 0, loopTo = lastIndex; i <= loopTo; i++) - { - string currentInScopePrefix = inScopePrefixes[i]; - var currentInScopeNs = inScopeNs[i]; - if (prefix.Equals(currentInScopePrefix)) - { - if (ns == currentInScopeNs) - { - // prefix and namespace match. Remove the unneeded ns attribute - a.Remove(); - } - - // prefix is in scope but refers to something else. Leave the ns attribute. - a = null; - break; - } - } - } - - if (a is object) - { - // Prefix is not in scope - // Now check whether it's going to be in scope because it is in the attributes list - - if (attributes is object) - { - int lastIndex = attributes.Count - 1; - for (int i = 0, loopTo1 = lastIndex; i <= loopTo1; i++) - { - var currentA = attributes[i]; - string currentInScopePrefix = currentA.Name.LocalName; - var currentInScopeNs = currentA.Annotation(); - if (currentInScopeNs is object) - { - if (prefix.Equals(currentInScopePrefix)) - { - if (ns == currentInScopeNs) - { - // prefix and namespace match. Remove the unneeded ns attribute - a.Remove(); - } - - // prefix is in scope but refers to something else. Leave the ns attribute. - a = null; - break; - } - } - } - } - - if (a is object) - { - // Prefix is definitely not in scope - a.Remove(); - // namespace is not defined either. Add this attributes list - attributes.Add(a); - } - } - } - } - - a = nextA; - } - } - - return e; - } - } -} \ No newline at end of file diff --git a/Pilz.Updating.Administration/My Project/MyNamespace.Static.3.Designer.cs b/Pilz.Updating.Administration/My Project/MyNamespace.Static.3.Designer.cs deleted file mode 100644 index b2b5044..0000000 --- a/Pilz.Updating.Administration/My Project/MyNamespace.Static.3.Designer.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.VisualBasic -{ - [Embedded()] - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Module | AttributeTargets.Assembly, Inherited = false)] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGenerated()] - internal sealed class Embedded : Attribute - { - } -} \ No newline at end of file diff --git a/Pilz.Updating.Administration/My Project/Resources.resx b/Pilz.Updating.Administration/My Project/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/Pilz.Updating.Administration/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Pilz.Updating.Administration/Pilz.Updating.Administration.csproj b/Pilz.Updating.Administration/Pilz.Updating.Administration.csproj index a031c2d..3b0453a 100644 --- a/Pilz.Updating.Administration/Pilz.Updating.Administration.csproj +++ b/Pilz.Updating.Administration/Pilz.Updating.Administration.csproj @@ -1,8 +1,7 @@  Pilz.Updating.Administration - Windows - net6.0-windows + net6.0-windows;net8.0-windows $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest Pilz.Updating.Server @@ -39,13 +38,12 @@ True - 1.yyyy.Mdd.Hmm - 1.2023.1120.1828 + 2.0.0 - + @@ -64,10 +62,6 @@ - - True - Application.myapp - True True @@ -88,10 +82,6 @@ - - MyApplicationCodeGenerator - Application.Designer.cs - SettingsSingleFileGenerator Pilz.Updating.My diff --git a/Pilz.Updating.Administration/Properties/Resources.Designer.cs b/Pilz.Updating.Administration/Properties/Resources.Designer.cs index 903cd27..09c8b8f 100644 --- a/Pilz.Updating.Administration/Properties/Resources.Designer.cs +++ b/Pilz.Updating.Administration/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Pilz.Updating.My.Resources { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj b/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj index 4ff01ad..fa941d6 100644 --- a/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj +++ b/Pilz.Updating.Client.GUI/Pilz.Updating.Client.GUI.csproj @@ -2,8 +2,7 @@ SM64_ROM_Manager.Updating.Client.GUI - Windows - net6.0-windows + net6.0-windows;net8.0-windows true $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest @@ -40,12 +39,11 @@ True - 1.yyyy.Mdd.Hmm - 1.2023.1120.1825 + 2.0.0 - + @@ -153,6 +151,7 @@ + diff --git a/Pilz.Updating.Client.GUI/Resources.Designer.cs b/Pilz.Updating.Client.GUI/Resources.Designer.cs index 16f4a57..42c0b2e 100644 --- a/Pilz.Updating.Client.GUI/Resources.Designer.cs +++ b/Pilz.Updating.Client.GUI/Resources.Designer.cs @@ -1,69 +1,63 @@ -// ------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 -// -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. // -// ------------------------------------------------------------------------------ - -using System.Diagnostics; -using Microsoft.VisualBasic; - -namespace Pilz.Updating.Client.GUI.My.Resources -{ +//------------------------------------------------------------------------------ +namespace SM64_ROM_Manager.Updating.Client.GUI.My.Resources { + using System; + + + /// + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - /// - /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. - /// - [System.CodeDom.Compiler.GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - [HideModuleName()] - internal static class Resources - { - private static System.Resources.ResourceManager resourceMan; - private static System.Globalization.CultureInfo resourceCulture; - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + /// - /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Resources.ResourceManager ResourceManager - { - get - { - if (ReferenceEquals(resourceMan, null)) - { - var temp = new System.Resources.ResourceManager("Pilz.Updating.Client.GUI.Resources", typeof(Resources).Assembly); + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SM64_ROM_Manager.Updating.Client.GUI.Resources", typeof(Resources).Assembly); resourceMan = temp; } - return resourceMan; } } - + /// - /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle - /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. /// - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Advanced)] - internal static System.Globalization.CultureInfo Culture - { - get - { + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - - set - { + set { resourceCulture = value; } } } -} \ No newline at end of file +} diff --git a/Pilz.Updating.Client.GUI/SimpleActionDialog.cs b/Pilz.Updating.Client.GUI/SimpleActionDialog.cs index c427e11..d9a7152 100644 --- a/Pilz.Updating.Client.GUI/SimpleActionDialog.cs +++ b/Pilz.Updating.Client.GUI/SimpleActionDialog.cs @@ -1,6 +1,4 @@ -using global::Pilz.Updating.Client.GUI.My.Resources; - -namespace Pilz.Updating.Client.GUI +namespace Pilz.Updating.Client.GUI { public partial class SimpleActionDialog { diff --git a/Pilz.Updating.Client.GUI/UpdateClientGUI.cs b/Pilz.Updating.Client.GUI/UpdateClientGUI.cs index 54e8bea..eb31fa3 100644 --- a/Pilz.Updating.Client.GUI/UpdateClientGUI.cs +++ b/Pilz.Updating.Client.GUI/UpdateClientGUI.cs @@ -1,10 +1,9 @@ -using global::System.ComponentModel; +using System.ComponentModel; using System.Drawing; -using global::System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using System.Windows.Forms; using Microsoft.VisualBasic.CompilerServices; -using global::Pilz.Updating.Client.GUI.My.Resources; using System; using Telerik.WinControls; using System.Threading.Tasks; diff --git a/Pilz.Updating.Client/My Project/Application.Designer.cs b/Pilz.Updating.Client/My Project/Application.Designer.cs deleted file mode 100644 index 2be760e..0000000 --- a/Pilz.Updating.Client/My Project/Application.Designer.cs +++ /dev/null @@ -1,11 +0,0 @@ -// ------------------------------------------------------------------------------ -// -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.42000 -// -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. -// -// ------------------------------------------------------------------------------ - - diff --git a/Pilz.Updating.Client/My Project/Application.myapp b/Pilz.Updating.Client/My Project/Application.myapp deleted file mode 100644 index 758895d..0000000 --- a/Pilz.Updating.Client/My Project/Application.myapp +++ /dev/null @@ -1,10 +0,0 @@ - - - false - false - 0 - true - 0 - 1 - true - diff --git a/Pilz.Updating.Client/My Project/MyNamespace.Static.1.Designer.cs b/Pilz.Updating.Client/My Project/MyNamespace.Static.1.Designer.cs deleted file mode 100644 index fddd658..0000000 --- a/Pilz.Updating.Client/My Project/MyNamespace.Static.1.Designer.cs +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Diagnostics; -using Microsoft.VisualBasic; - -/* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia */ - /* TODO ERROR: Skipped DefineDirectiveTrivia *//* TODO ERROR: Skipped DefineDirectiveTrivia *//* TODO ERROR: Skipped DefineDirectiveTrivia *//* TODO ERROR: Skipped DefineDirectiveTrivia */ - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ -namespace Pilz.Updating.My -{ - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.CodeDom.Compiler.GeneratedCode("MyTemplate", "11.0.0.0")] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia */ - internal partial class MyApplication : Microsoft.VisualBasic.ApplicationServices.ApplicationBase - { - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - } - - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.CodeDom.Compiler.GeneratedCode("MyTemplate", "11.0.0.0")] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - internal partial class MyComputer : Microsoft.VisualBasic.Devices.Computer - { - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - [DebuggerHidden()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public MyComputer() : base() - { - } - } - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - [HideModuleName()] - [System.CodeDom.Compiler.GeneratedCode("MyTemplate", "11.0.0.0")] - internal static class MyProject - { - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.Computer")] - internal static MyComputer Computer - { - [DebuggerHidden()] - get - { - return m_ComputerObjectProvider.GetInstance; - } - } - - private readonly static ThreadSafeObjectProvider m_ComputerObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.Application")] - internal static MyApplication Application - { - [DebuggerHidden()] - get - { - return m_AppObjectProvider.GetInstance; - } - } - - private readonly static ThreadSafeObjectProvider m_AppObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.User")] - internal static Microsoft.VisualBasic.ApplicationServices.User User - { - [DebuggerHidden()] - get - { - return m_UserObjectProvider.GetInstance; - } - } - - private readonly static ThreadSafeObjectProvider m_UserObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.WebServices")] - internal static MyWebServices WebServices - { - [DebuggerHidden()] - get - { - return m_MyWebServicesObjectProvider.GetInstance; - } - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [MyGroupCollection("System.Web.Services.Protocols.SoapHttpClientProtocol", "Create__Instance__", "Dispose__Instance__", "")] - internal sealed class MyWebServices - { - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - public override bool Equals(object o) - { - return base.Equals(o); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - public override int GetHashCode() - { - return base.GetHashCode(); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - internal new Type GetType() - { - return typeof(MyWebServices); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - public override string ToString() - { - return base.ToString(); - } - - [DebuggerHidden()] - private static T Create__Instance__(T instance) where T : new() - { - if (instance == null) - { - return new T(); - } - else - { - return instance; - } - } - - [DebuggerHidden()] - private void Dispose__Instance__(ref T instance) - { - instance = default; - } - - [DebuggerHidden()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public MyWebServices() : base() - { - } - } - - private readonly static ThreadSafeObjectProvider m_MyWebServicesObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [System.Runtime.InteropServices.ComVisible(false)] - internal sealed class ThreadSafeObjectProvider where T : new() - { - internal T GetInstance - { - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [DebuggerHidden()] - get - { - var Value = m_Context.Value; - if (Value == null) - { - Value = new T(); - m_Context.Value = Value; - } - - return Value; - } - /* TODO ERROR: Skipped ElseDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - } - - [DebuggerHidden()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public ThreadSafeObjectProvider() : base() - { - } - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - private readonly Microsoft.VisualBasic.MyServices.Internal.ContextValue m_Context = new Microsoft.VisualBasic.MyServices.Internal.ContextValue(); - /* TODO ERROR: Skipped ElseDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - } - } -} -/* TODO ERROR: Skipped EndIfDirectiveTrivia */ diff --git a/Pilz.Updating.Client/My Project/MyNamespace.Static.2.Designer.cs b/Pilz.Updating.Client/My Project/MyNamespace.Static.2.Designer.cs deleted file mode 100644 index 056f982..0000000 --- a/Pilz.Updating.Client/My Project/MyNamespace.Static.2.Designer.cs +++ /dev/null @@ -1,253 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -// See Compiler::LoadXmlSolutionExtension -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.Diagnostics; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualBasic; -using Microsoft.VisualBasic.CompilerServices; - -namespace Pilz.Updating.My -{ - [Embedded()] - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal sealed class InternalXmlHelper - { - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - private InternalXmlHelper() - { - } - - public static string get_Value(IEnumerable source) - { - foreach (XElement item in source) - return item.Value; - return null; - } - - public static void set_Value(IEnumerable source, string value) - { - foreach (XElement item in source) - { - item.Value = value; - break; - } - } - - public static string get_AttributeValue(IEnumerable source, XName name) - { - foreach (XElement item in source) - return Conversions.ToString(item.Attribute(name)); - return null; - } - - public static void set_AttributeValue(IEnumerable source, XName name, string value) - { - foreach (XElement item in source) - { - item.SetAttributeValue(name, value); - break; - } - } - - public static string get_AttributeValue(XElement source, XName name) - { - return Conversions.ToString(source.Attribute(name)); - } - - public static void set_AttributeValue(XElement source, XName name, string value) - { - source.SetAttributeValue(name, value); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static XAttribute CreateAttribute(XName name, object value) - { - if (value is null) - { - return null; - } - - return new XAttribute(name, value); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static XAttribute CreateNamespaceAttribute(XName name, XNamespace ns) - { - var a = new XAttribute(name, ns.NamespaceName); - a.AddAnnotation(ns); - return a; - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static object RemoveNamespaceAttributes(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes, object obj) - { - if (obj is object) - { - XElement elem = obj as XElement; - if (elem is object) - { - return RemoveNamespaceAttributes(inScopePrefixes, inScopeNs, attributes, elem); - } - else - { - IEnumerable elems = obj as IEnumerable; - if (elems is object) - { - return RemoveNamespaceAttributes(inScopePrefixes, inScopeNs, attributes, elems); - } - } - } - - return obj; - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static IEnumerable RemoveNamespaceAttributes(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes, IEnumerable obj) - { - if (obj is object) - { - IEnumerable elems = obj as IEnumerable; - if (elems is object) - { - return elems.Select(new RemoveNamespaceAttributesClosure(inScopePrefixes, inScopeNs, attributes).ProcessXElement); - } - else - { - return obj.Cast().Select(new RemoveNamespaceAttributesClosure(inScopePrefixes, inScopeNs, attributes).ProcessObject); - } - } - - return obj; - } - - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - private sealed class RemoveNamespaceAttributesClosure - { - private readonly string[] m_inScopePrefixes; - private readonly XNamespace[] m_inScopeNs; - private readonly List m_attributes; - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal RemoveNamespaceAttributesClosure(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes) - { - m_inScopePrefixes = inScopePrefixes; - m_inScopeNs = inScopeNs; - m_attributes = attributes; - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal XElement ProcessXElement(XElement elem) - { - return RemoveNamespaceAttributes(m_inScopePrefixes, m_inScopeNs, m_attributes, elem); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal object ProcessObject(object obj) - { - XElement elem = obj as XElement; - if (elem is object) - { - return RemoveNamespaceAttributes(m_inScopePrefixes, m_inScopeNs, m_attributes, elem); - } - else - { - return obj; - } - } - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static XElement RemoveNamespaceAttributes(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes, XElement e) - { - if (e is object) - { - var a = e.FirstAttribute; - while (a is object) - { - var nextA = a.NextAttribute; - if (a.IsNamespaceDeclaration) - { - var ns = a.Annotation(); - string prefix = a.Name.LocalName; - if (ns is object) - { - if (inScopePrefixes is object && inScopeNs is object) - { - int lastIndex = inScopePrefixes.Length - 1; - for (int i = 0, loopTo = lastIndex; i <= loopTo; i++) - { - string currentInScopePrefix = inScopePrefixes[i]; - var currentInScopeNs = inScopeNs[i]; - if (prefix.Equals(currentInScopePrefix)) - { - if (ns == currentInScopeNs) - { - // prefix and namespace match. Remove the unneeded ns attribute - a.Remove(); - } - - // prefix is in scope but refers to something else. Leave the ns attribute. - a = null; - break; - } - } - } - - if (a is object) - { - // Prefix is not in scope - // Now check whether it's going to be in scope because it is in the attributes list - - if (attributes is object) - { - int lastIndex = attributes.Count - 1; - for (int i = 0, loopTo1 = lastIndex; i <= loopTo1; i++) - { - var currentA = attributes[i]; - string currentInScopePrefix = currentA.Name.LocalName; - var currentInScopeNs = currentA.Annotation(); - if (currentInScopeNs is object) - { - if (prefix.Equals(currentInScopePrefix)) - { - if (ns == currentInScopeNs) - { - // prefix and namespace match. Remove the unneeded ns attribute - a.Remove(); - } - - // prefix is in scope but refers to something else. Leave the ns attribute. - a = null; - break; - } - } - } - } - - if (a is object) - { - // Prefix is definitely not in scope - a.Remove(); - // namespace is not defined either. Add this attributes list - attributes.Add(a); - } - } - } - } - - a = nextA; - } - } - - return e; - } - } -} \ No newline at end of file diff --git a/Pilz.Updating.Client/My Project/MyNamespace.Static.3.Designer.cs b/Pilz.Updating.Client/My Project/MyNamespace.Static.3.Designer.cs deleted file mode 100644 index b2b5044..0000000 --- a/Pilz.Updating.Client/My Project/MyNamespace.Static.3.Designer.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.VisualBasic -{ - [Embedded()] - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Module | AttributeTargets.Assembly, Inherited = false)] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGenerated()] - internal sealed class Embedded : Attribute - { - } -} \ No newline at end of file diff --git a/Pilz.Updating.Client/My Project/Resources.resx b/Pilz.Updating.Client/My Project/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/Pilz.Updating.Client/My Project/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Pilz.Updating.Client/Pilz.Updating.Client.csproj b/Pilz.Updating.Client/Pilz.Updating.Client.csproj index 9977f2a..a5bc543 100644 --- a/Pilz.Updating.Client/Pilz.Updating.Client.csproj +++ b/Pilz.Updating.Client/Pilz.Updating.Client.csproj @@ -1,8 +1,7 @@  Pilz.Updating - Windows - net6.0-windows + net6.0-windows;net8.0-windows $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest Pilz.Updating.Client @@ -39,12 +38,11 @@ True - 1.yyyy.Mdd.Hmm - 1.2023.1120.1825 + 2.0.0 - + @@ -62,10 +60,6 @@ - - True - Application.myapp - True True @@ -86,10 +80,6 @@ - - MyApplicationCodeGenerator - Application.Designer.cs - SettingsSingleFileGenerator Pilz.Updating.My @@ -97,8 +87,8 @@ - - + + diff --git a/Pilz.Updating.Client/Properties/Resources.Designer.cs b/Pilz.Updating.Client/Properties/Resources.Designer.cs index 9003737..26acd09 100644 --- a/Pilz.Updating.Client/Properties/Resources.Designer.cs +++ b/Pilz.Updating.Client/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Pilz.Updating.My.Resources { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Pilz.Updating.GUIBase/Pilz.Updating.GUIBase.csproj b/Pilz.Updating.GUIBase/Pilz.Updating.GUIBase.csproj index 4c4f1e8..0d0fab1 100644 --- a/Pilz.Updating.GUIBase/Pilz.Updating.GUIBase.csproj +++ b/Pilz.Updating.GUIBase/Pilz.Updating.GUIBase.csproj @@ -1,8 +1,7 @@  Pilz.Updating.GUIBase - Windows - net6.0-windows + net6.0-windows;net8.0-windows $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest Pilz.Updating.GUIBase @@ -38,19 +37,13 @@ True - 1.yyyy.Mdd.Hmm - 1.2023.1120.1825 + 2.0.0 - - - ..\Shared Libs\DotNetBarNew\DevComponents.DotNetBar2.dll - - diff --git a/Pilz.Updating.GUIBase/Properties/Resources.Designer.cs b/Pilz.Updating.GUIBase/Properties/Resources.Designer.cs index 4e5285d..3cdbb19 100644 --- a/Pilz.Updating.GUIBase/Properties/Resources.Designer.cs +++ b/Pilz.Updating.GUIBase/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Pilz.Updating.GUIBase.My.Resources { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Pilz.Updating.UpdateInstaller.AddOns/Pilz.Updating.UpdateInstaller.AddOns.csproj b/Pilz.Updating.UpdateInstaller.AddOns/Pilz.Updating.UpdateInstaller.AddOns.csproj new file mode 100644 index 0000000..d85da20 --- /dev/null +++ b/Pilz.Updating.UpdateInstaller.AddOns/Pilz.Updating.UpdateInstaller.AddOns.csproj @@ -0,0 +1,11 @@ + + + + net6.0;net8.0 + enable + enable + 1.0.0 + True + + + diff --git a/Pilz.Updating.UpdateInstaller.AddOns/UpdateInstallerFunctionTypes.cs b/Pilz.Updating.UpdateInstaller.AddOns/UpdateInstallerFunctionTypes.cs new file mode 100644 index 0000000..44604ee --- /dev/null +++ b/Pilz.Updating.UpdateInstaller.AddOns/UpdateInstallerFunctionTypes.cs @@ -0,0 +1,14 @@ +namespace Pilz.Updating.UpdateInstaller.AddOns +{ + public static class UpdateInstallerFunctionTypes + { + /// + /// The function will be executed when a instance of UpdateInstaller has been created. + /// Parameter:
+ /// + /// Result type:
+ /// + /// + public const string OnInstancingUpdateInstaller = "pilz.updating.updateinstaller.oninstancingupdateinstaller"; + } +} diff --git a/Pilz.Updating.UpdateInstaller.Lib/Pilz.Updating.UpdateInstaller.Lib.csproj b/Pilz.Updating.UpdateInstaller.Lib/Pilz.Updating.UpdateInstaller.Lib.csproj new file mode 100644 index 0000000..52d672b --- /dev/null +++ b/Pilz.Updating.UpdateInstaller.Lib/Pilz.Updating.UpdateInstaller.Lib.csproj @@ -0,0 +1,20 @@ + + + + net6.0-windows;net8.0-windows + enable + enable + True + + + + True + 2.0.0 + + + + + + + + diff --git a/Pilz.Updating.UpdateInstaller/UpdateInstaller.cs b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstaller.cs similarity index 78% rename from Pilz.Updating.UpdateInstaller/UpdateInstaller.cs rename to Pilz.Updating.UpdateInstaller.Lib/UpdateInstaller.cs index 982a617..dc39862 100644 --- a/Pilz.Updating.UpdateInstaller/UpdateInstaller.cs +++ b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstaller.cs @@ -1,23 +1,25 @@ using System; using System.Diagnostics; -using global::System.IO; -using global::System.IO.Compression; +using System.IO; +using System.IO.Compression; using System.Linq; -using global::System.Reflection; +using System.Reflection; using System.Threading.Tasks; using Microsoft.VisualBasic.CompilerServices; -namespace Pilz.Updating.UpdateInstaller +namespace Pilz.Updating.UpdateInstaller.Lib { - internal class UpdateInstaller + public class UpdateInstaller { - // E v e n t s - public event StatusChangesEventHandler StatusChanges; - + public delegate void UpdateInstallerEventHandler(object sender, UpdateInstallerEventArgs e); + public delegate void UpdateInstallerStepEventHandler(object sender, UpdateInstallerStepEventArgs e); public delegate void StatusChangesEventHandler(object sender, UpdateInstallerStatusChangedEventArgs e); + public event StatusChangesEventHandler StatusChanges; + public event UpdateInstallerStepEventHandler OnStep; + // F i e l d s private string dataPath = string.Empty; @@ -35,6 +37,11 @@ namespace Pilz.Updating.UpdateInstaller // F e a t u r e s + private void ChangeStep(UpdateInstallerStep step, UpdateInstallerStepState state) + { + OnStep?.Invoke(this, new UpdateInstallerStepEventArgs(this, step, state)); + } + private void ChangeStatus(UpdateInstallerStatus newStatus) { StatusChanges?.Invoke(this, new UpdateInstallerStatusChangedEventArgs(newStatus)); @@ -50,19 +57,29 @@ namespace Pilz.Updating.UpdateInstaller public void InstallUpdate() { + ChangeStep(UpdateInstallerStep.Startup, UpdateInstallerStepState.Default); + // Extract Package ChangeStatus(UpdateInstallerStatus.Extracting); + ChangeStep(UpdateInstallerStep.ExtractPackage, UpdateInstallerStepState.PreEvent); ExtractPackage(); + ChangeStep(UpdateInstallerStep.ExtractPackage, UpdateInstallerStepState.PostEvent); // Install Package - InstallPackage(); + ChangeStatus(UpdateInstallerStatus.CopyingFiles); + ChangeStep(UpdateInstallerStep.CopyFiles, UpdateInstallerStepState.PreEvent); + CopyFiles(); + ChangeStep(UpdateInstallerStep.CopyFiles, UpdateInstallerStepState.PostEvent); // Delete Package ChangeStatus(UpdateInstallerStatus.RemovingFiles); + ChangeStep(UpdateInstallerStep.DeletePackage, UpdateInstallerStepState.PreEvent); DeletePackage(); + ChangeStep(UpdateInstallerStep.DeletePackage, UpdateInstallerStepState.PostEvent); // Finish ChangeStatus(UpdateInstallerStatus.Done); + ChangeStep(UpdateInstallerStep.Finish, UpdateInstallerStepState.Default); } public void WaitForHostApplication() @@ -115,21 +132,6 @@ namespace Pilz.Updating.UpdateInstaller ZipFile.ExtractToDirectory(zipPath, dataPath); } - private void InstallPackage() - { - // Run installation addon - ChangeStatus(UpdateInstallerStatus.RunningAddons); - RunAddOns(false); - - // Copy files - ChangeStatus(UpdateInstallerStatus.CopyingFiles); - CopyFiles(); - - // Run installation addon - ChangeStatus(UpdateInstallerStatus.RunningAddons); - RunAddOns(true); - } - private void CopyFiles() { var sourceDir = new DirectoryInfo(Path.Combine(dataPath, PackageFileNameDefinations.ZIP_APP_DATA_FILES_DIRECTORY)); @@ -163,20 +165,6 @@ namespace Pilz.Updating.UpdateInstaller } } - private void RunAddOns(bool isAfterCopyFiles) - { - foreach (string addOnPath in Directory.GetFiles(Path.Combine(General.MyAppPath, "AddOns"))) // Directory.GetFiles(Path.Combine(dataPath, ZIP_UPDATE_INSTALLER_ADDONS_DIRECTORY)) - { - var asm = Assembly.LoadFile(addOnPath); - var t = asm.GetType($"{UpdateInstallerAddOnNameDefinitions.UPDATE_INSTALLER_ADDON_NAMESPACE}.{UpdateInstallerAddOnNameDefinitions.UPDATE_INSTALLER_ADDON_TYPE}", false); - if (t is object) - { - var m = t.GetMethod(UpdateInstallerAddOnNameDefinitions.UPDATE_INSTALLER_ADDON_METHOD, BindingFlags.Static | BindingFlags.Public); - m?.Invoke(null, new object[] { Configuration, isAfterCopyFiles }); - } - } - } - private void DeletePackage() { Directory.Delete(Configuration.PackagePath, true); diff --git a/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerEventArgs.cs b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerEventArgs.cs new file mode 100644 index 0000000..12b4274 --- /dev/null +++ b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerEventArgs.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Pilz.Updating.UpdateInstaller.Lib +{ + public class UpdateInstallerEventArgs : EventArgs + { + public UpdateInstaller UpdateInstaller { get; init; } + + public UpdateInstallerEventArgs(UpdateInstaller updateInstaller) + { + UpdateInstaller = updateInstaller; + } + } +} diff --git a/Pilz.Updating.UpdateInstaller/UpdateInstallerStatus.cs b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStatus.cs similarity index 52% rename from Pilz.Updating.UpdateInstaller/UpdateInstallerStatus.cs rename to Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStatus.cs index 237c6d3..841dae2 100644 --- a/Pilz.Updating.UpdateInstaller/UpdateInstallerStatus.cs +++ b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStatus.cs @@ -1,12 +1,11 @@  -namespace Pilz.Updating.UpdateInstaller +namespace Pilz.Updating.UpdateInstaller.Lib { - internal enum UpdateInstallerStatus + public enum UpdateInstallerStatus { Waiting, Extracting, CopyingFiles, - RunningAddons, RemovingFiles, Done } diff --git a/Pilz.Updating.UpdateInstaller/UpdateInstallerStatusChangedEventArgs.cs b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStatusChangedEventArgs.cs similarity index 69% rename from Pilz.Updating.UpdateInstaller/UpdateInstallerStatusChangedEventArgs.cs rename to Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStatusChangedEventArgs.cs index 98f9ebc..5a35bf0 100644 --- a/Pilz.Updating.UpdateInstaller/UpdateInstallerStatusChangedEventArgs.cs +++ b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStatusChangedEventArgs.cs @@ -1,8 +1,8 @@ using System; -namespace Pilz.Updating.UpdateInstaller +namespace Pilz.Updating.UpdateInstaller.Lib { - internal class UpdateInstallerStatusChangedEventArgs : EventArgs + public class UpdateInstallerStatusChangedEventArgs : EventArgs { public UpdateInstallerStatus NewStatus { get; private set; } diff --git a/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStep.cs b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStep.cs new file mode 100644 index 0000000..a8daf51 --- /dev/null +++ b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStep.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Pilz.Updating.UpdateInstaller.Lib +{ + public enum UpdateInstallerStep + { + Startup, + ExtractPackage, + CopyFiles, + DeletePackage, + Finish + } +} diff --git a/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStepEventArgs.cs b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStepEventArgs.cs new file mode 100644 index 0000000..079780e --- /dev/null +++ b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStepEventArgs.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Pilz.Updating.UpdateInstaller.Lib +{ + public class UpdateInstallerStepEventArgs : UpdateInstallerEventArgs + { + public UpdateInstallerStep Step { get; init; } + public UpdateInstallerStepState State { get; init; } + + public UpdateInstallerStepEventArgs(UpdateInstaller updateInstaller, UpdateInstallerStep step, UpdateInstallerStepState state) : base(updateInstaller) + { + Step = step; + State = state; + } + } +} diff --git a/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStepState.cs b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStepState.cs new file mode 100644 index 0000000..72a299d --- /dev/null +++ b/Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStepState.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Pilz.Updating.UpdateInstaller.Lib +{ + public enum UpdateInstallerStepState + { + Default, + PreEvent, + PostEvent + } +} diff --git a/Pilz.Updating.UpdateInstaller/General.cs b/Pilz.Updating.UpdateInstaller/General.cs index 56075ea..bf29956 100644 --- a/Pilz.Updating.UpdateInstaller/General.cs +++ b/Pilz.Updating.UpdateInstaller/General.cs @@ -1,23 +1,37 @@ -using global::System.IO; -using global::System.Reflection; +using System.IO; +using System.Reflection; +using Pilz.Plugins; +using System.Configuration; +using Z.Reflection.Extensions; namespace Pilz.Updating.UpdateInstaller { internal static class General { - private static string p = string.Empty; + private static string p = null; public static string MyAppPath { get { if (string.IsNullOrEmpty(p)) - { p = Path.GetDirectoryName(IO.Extensions.GetExecutablePath()); - } - return p; } } + + public static void LoadAddons(bool isAfterCopyFiles, string folderPath) + { + var pluginsPath = Path.Combine(MyAppPath, "AddOns"); + if (Directory.Exists(pluginsPath)) + { + foreach (var subdir in Directory.GetDirectories(pluginsPath, string.Empty, SearchOption.TopDirectoryOnly)) + { + var pluginPath = Path.Combine(subdir, Path.GetFileName(subdir) + ".dll"); + if (File.Exists(pluginPath)) + PluginManager.Instance.LoadPlugin(pluginPath); + } + } + } } } \ No newline at end of file diff --git a/Pilz.Updating.UpdateInstaller/Main.cs b/Pilz.Updating.UpdateInstaller/Main.cs index d08d204..fb27f92 100644 --- a/Pilz.Updating.UpdateInstaller/Main.cs +++ b/Pilz.Updating.UpdateInstaller/Main.cs @@ -6,12 +6,14 @@ using System.Threading.Tasks; using System.Windows.Forms; using Telerik.WinControls; using Telerik.WinControls.Themes; +using Pilz.Updating.UpdateInstaller.Lib; +using Pilz.Plugins.Advanced; +using Pilz.Updating.UpdateInstaller.AddOns; namespace Pilz.Updating.UpdateInstaller { public partial class Main { - // C o n s t r u c t o r s public Main() @@ -26,58 +28,34 @@ namespace Pilz.Updating.UpdateInstaller if (args.Any()) { // Load config - Installer = new UpdateInstaller(UpdateInstallerConfig.Parse(args[0])); + installer = new Lib.UpdateInstaller(UpdateInstallerConfig.Parse(args[0])); + PluginFunctionController.Instance.ExecuteAll(UpdateInstallerFunctionTypes.OnInstancingUpdateInstaller); // Init Form InitializeComponent(); // Init Style - RadThemeComponentBase themeToUse = Installer.Configuration.UIDarkMode ? new FluentDarkTheme() : new FluentTheme(); + RadThemeComponentBase themeToUse = installer.Configuration.UIDarkMode ? new FluentDarkTheme() : new FluentTheme(); ThemeResolutionService.ApplicationThemeName = themeToUse.ThemeName; // Init Application Header Text string header; - if (!string.IsNullOrEmpty(Installer.Configuration.ApplicationName)) - { - header = string.Format(My.Resources.UpdateInstallerGuiLangRes.String_UpdatingApplicationX, Installer.Configuration.ApplicationName); - } + if (!string.IsNullOrEmpty(installer.Configuration.ApplicationName)) + header = string.Format(My.Resources.UpdateInstallerGuiLangRes.String_UpdatingApplicationX, installer.Configuration.ApplicationName); else - { header = My.Resources.UpdateInstallerGuiLangRes.String_UpdateIsRunning; - } radLabel_Header.Text = $"{header}"; } - if (Installer is null) + if (installer is null) Environment.Exit(0); } // F i e l d s private bool allowClose = false; - private UpdateInstaller _Installer; - - private UpdateInstaller Installer - { - get - { - return _Installer; - } - set - { - if (_Installer != null) - { - _Installer.StatusChanges -= Installer_StatusChanges; - } - - _Installer = value; - if (_Installer != null) - { - _Installer.StatusChanges += Installer_StatusChanges; - } - } - } + private readonly Lib.UpdateInstaller installer; // F e a t u r e s @@ -97,9 +75,6 @@ namespace Pilz.Updating.UpdateInstaller case UpdateInstallerStatus.Extracting: newStatusText = My.Resources.UpdateInstallerGuiLangRes.Status_Extracting; break; - case UpdateInstallerStatus.RunningAddons: - newStatusText = My.Resources.UpdateInstallerGuiLangRes.Status_RunningAddOns; - break; case UpdateInstallerStatus.RemovingFiles: newStatusText = My.Resources.UpdateInstallerGuiLangRes.Status_RemovingFiles; break; @@ -116,9 +91,6 @@ namespace Pilz.Updating.UpdateInstaller case UpdateInstallerStatus.Extracting: newStatusImage = MyIcons.icons8_open_archive_16px; break; - case UpdateInstallerStatus.RunningAddons: - newStatusImage = MyIcons.icons8_console_16px_1; - break; case UpdateInstallerStatus.RemovingFiles: newStatusImage = MyIcons.icons8_recycle_bin_16px; break; @@ -143,12 +115,12 @@ namespace Pilz.Updating.UpdateInstaller private async Task WaitforHostApp() { SetStatus(UpdateInstallerStatus.Waiting); - await Task.Run(() => Installer.WaitForHostApplication()); + await Task.Run(() => installer.WaitForHostApplication()); } private async void ExecuteUpdate() { - await Task.Run(() => Installer.InstallUpdate()); + await Task.Run(() => installer.InstallUpdate()); allowClose = true; Close(); } @@ -162,7 +134,7 @@ namespace Pilz.Updating.UpdateInstaller private void Main_FormClosed(object sender, FormClosedEventArgs e) { - Installer.StartHostApplication(); + installer.StartHostApplication(); } private void Main_FormClosing(object sender, FormClosingEventArgs e) diff --git a/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj b/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj index 1e04123..9d2c3b2 100644 --- a/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj +++ b/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj @@ -1,10 +1,10 @@ - + WinExe Pilz.Updating.UpdateInstaller.My.MyApplication Pilz.Updating.UpdateInstaller WindowsForms - net6.0-windows + net8.0-windows true $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest @@ -47,7 +47,9 @@ - + + + @@ -146,6 +148,8 @@ + + diff --git a/Pilz.Updating.sln b/Pilz.Updating.sln index 07f3bd8..853998f 100644 --- a/Pilz.Updating.sln +++ b/Pilz.Updating.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.32002.261 +# Visual Studio Version 17 +VisualStudioVersion = 17.8.34309.116 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Updating.Administration", "Pilz.Updating.Administration\Pilz.Updating.Administration.csproj", "{4FC947B8-263B-4EF4-9473-1EBAC48F11E8}" EndProject @@ -17,6 +17,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Updating.Client.GUI", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pilz.Updating", "Pilz.Updating\Pilz.Updating.csproj", "{CFC81C75-299C-4DE4-9F19-8E061972E271}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pilz.Updating.UpdateInstaller.Lib", "Pilz.Updating.UpdateInstaller.Lib\Pilz.Updating.UpdateInstaller.Lib.csproj", "{F05AAEA2-386F-4307-AE5E-6831F4EA2B66}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pilz.Updating.UpdateInstaller.AddOns", "Pilz.Updating.UpdateInstaller.AddOns\Pilz.Updating.UpdateInstaller.AddOns.csproj", "{B44AB62C-B179-45B8-B7E6-C822F432CC20}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,6 +55,14 @@ Global {CFC81C75-299C-4DE4-9F19-8E061972E271}.Debug|Any CPU.Build.0 = Debug|Any CPU {CFC81C75-299C-4DE4-9F19-8E061972E271}.Release|Any CPU.ActiveCfg = Release|Any CPU {CFC81C75-299C-4DE4-9F19-8E061972E271}.Release|Any CPU.Build.0 = Release|Any CPU + {F05AAEA2-386F-4307-AE5E-6831F4EA2B66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F05AAEA2-386F-4307-AE5E-6831F4EA2B66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F05AAEA2-386F-4307-AE5E-6831F4EA2B66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F05AAEA2-386F-4307-AE5E-6831F4EA2B66}.Release|Any CPU.Build.0 = Release|Any CPU + {B44AB62C-B179-45B8-B7E6-C822F432CC20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B44AB62C-B179-45B8-B7E6-C822F432CC20}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B44AB62C-B179-45B8-B7E6-C822F432CC20}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B44AB62C-B179-45B8-B7E6-C822F432CC20}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Pilz.Updating/My Project/Application.Designer.cs b/Pilz.Updating/My Project/Application.Designer.cs deleted file mode 100644 index 5e9e2a0..0000000 --- a/Pilz.Updating/My Project/Application.Designer.cs +++ /dev/null @@ -1,11 +0,0 @@ -// ------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -// ------------------------------------------------------------------------------ - - diff --git a/Pilz.Updating/My Project/Application.myapp b/Pilz.Updating/My Project/Application.myapp deleted file mode 100644 index 758895d..0000000 --- a/Pilz.Updating/My Project/Application.myapp +++ /dev/null @@ -1,10 +0,0 @@ - - - false - false - 0 - true - 0 - 1 - true - diff --git a/Pilz.Updating/My Project/MyNamespace.Static.1.Designer.cs b/Pilz.Updating/My Project/MyNamespace.Static.1.Designer.cs deleted file mode 100644 index 75d346a..0000000 --- a/Pilz.Updating/My Project/MyNamespace.Static.1.Designer.cs +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Diagnostics; -using Microsoft.VisualBasic; - -/* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ -/* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia */ -/* TODO ERROR: Skipped DefineDirectiveTrivia *//* TODO ERROR: Skipped DefineDirectiveTrivia *//* TODO ERROR: Skipped DefineDirectiveTrivia *//* TODO ERROR: Skipped DefineDirectiveTrivia */ -/* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ -/* TODO ERROR: Skipped IfDirectiveTrivia */ -namespace Pilz.Updating.My -{ - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.CodeDom.Compiler.GeneratedCode("MyTemplate", "11.0.0.0")] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped ElifDirectiveTrivia */ - internal partial class MyApplication : Microsoft.VisualBasic.ApplicationServices.ApplicationBase - { - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - } - - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.CodeDom.Compiler.GeneratedCode("MyTemplate", "11.0.0.0")] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - internal partial class MyComputer : Microsoft.VisualBasic.Devices.Computer - { - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - [DebuggerHidden()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public MyComputer() : base() - { - } - } - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - [HideModuleName()] - [System.CodeDom.Compiler.GeneratedCode("MyTemplate", "11.0.0.0")] - internal static class MyProject - { - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.Computer")] - internal static MyComputer Computer - { - [DebuggerHidden()] - get - { - return m_ComputerObjectProvider.GetInstance; - } - } - - private readonly static ThreadSafeObjectProvider m_ComputerObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.Application")] - internal static MyApplication Application - { - [DebuggerHidden()] - get - { - return m_AppObjectProvider.GetInstance; - } - } - - private readonly static ThreadSafeObjectProvider m_AppObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.User")] - internal static Microsoft.VisualBasic.ApplicationServices.User User - { - [DebuggerHidden()] - get - { - return m_UserObjectProvider.GetInstance; - } - } - - private readonly static ThreadSafeObjectProvider m_UserObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped ElifDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [System.ComponentModel.Design.HelpKeyword("My.WebServices")] - internal static MyWebServices WebServices - { - [DebuggerHidden()] - get - { - return m_MyWebServicesObjectProvider.GetInstance; - } - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [MyGroupCollection("System.Web.Services.Protocols.SoapHttpClientProtocol", "Create__Instance__", "Dispose__Instance__", "")] - internal sealed class MyWebServices - { - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - public override bool Equals(object o) - { - return base.Equals(o); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - public override int GetHashCode() - { - return base.GetHashCode(); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - internal new Type GetType() - { - return typeof(MyWebServices); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [DebuggerHidden()] - public override string ToString() - { - return base.ToString(); - } - - [DebuggerHidden()] - private static T Create__Instance__(T instance) where T : new() - { - if (instance == null) - { - return new T(); - } - else - { - return instance; - } - } - - [DebuggerHidden()] - private void Dispose__Instance__(ref T instance) - { - instance = default; - } - - [DebuggerHidden()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public MyWebServices() : base() - { - } - } - - private readonly static ThreadSafeObjectProvider m_MyWebServicesObjectProvider = new ThreadSafeObjectProvider(); - /* TODO ERROR: Skipped EndIfDirectiveTrivia */ - /* TODO ERROR: Skipped IfDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [System.Runtime.InteropServices.ComVisible(false)] - internal sealed class ThreadSafeObjectProvider where T : new() - { - internal T GetInstance - { - /* TODO ERROR: Skipped IfDirectiveTrivia */ - [DebuggerHidden()] - get - { - var Value = m_Context.Value; - if (Value == null) - { - Value = new T(); - m_Context.Value = Value; - } - - return Value; - } - /* TODO ERROR: Skipped ElseDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - } - - [DebuggerHidden()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public ThreadSafeObjectProvider() : base() - { - } - - /* TODO ERROR: Skipped IfDirectiveTrivia */ - private readonly Microsoft.VisualBasic.MyServices.Internal.ContextValue m_Context = new Microsoft.VisualBasic.MyServices.Internal.ContextValue(); - /* TODO ERROR: Skipped ElseDirectiveTrivia *//* TODO ERROR: Skipped DisabledTextTrivia *//* TODO ERROR: Skipped EndIfDirectiveTrivia */ - } - } -} -/* TODO ERROR: Skipped EndIfDirectiveTrivia */ diff --git a/Pilz.Updating/My Project/MyNamespace.Static.2.Designer.cs b/Pilz.Updating/My Project/MyNamespace.Static.2.Designer.cs deleted file mode 100644 index 056f982..0000000 --- a/Pilz.Updating/My Project/MyNamespace.Static.2.Designer.cs +++ /dev/null @@ -1,253 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -// See Compiler::LoadXmlSolutionExtension -using System.Collections; -using System.Collections.Generic; -using System.Data; -using System.Diagnostics; -using System.Linq; -using System.Xml.Linq; -using Microsoft.VisualBasic; -using Microsoft.VisualBasic.CompilerServices; - -namespace Pilz.Updating.My -{ - [Embedded()] - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal sealed class InternalXmlHelper - { - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - private InternalXmlHelper() - { - } - - public static string get_Value(IEnumerable source) - { - foreach (XElement item in source) - return item.Value; - return null; - } - - public static void set_Value(IEnumerable source, string value) - { - foreach (XElement item in source) - { - item.Value = value; - break; - } - } - - public static string get_AttributeValue(IEnumerable source, XName name) - { - foreach (XElement item in source) - return Conversions.ToString(item.Attribute(name)); - return null; - } - - public static void set_AttributeValue(IEnumerable source, XName name, string value) - { - foreach (XElement item in source) - { - item.SetAttributeValue(name, value); - break; - } - } - - public static string get_AttributeValue(XElement source, XName name) - { - return Conversions.ToString(source.Attribute(name)); - } - - public static void set_AttributeValue(XElement source, XName name, string value) - { - source.SetAttributeValue(name, value); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static XAttribute CreateAttribute(XName name, object value) - { - if (value is null) - { - return null; - } - - return new XAttribute(name, value); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static XAttribute CreateNamespaceAttribute(XName name, XNamespace ns) - { - var a = new XAttribute(name, ns.NamespaceName); - a.AddAnnotation(ns); - return a; - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static object RemoveNamespaceAttributes(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes, object obj) - { - if (obj is object) - { - XElement elem = obj as XElement; - if (elem is object) - { - return RemoveNamespaceAttributes(inScopePrefixes, inScopeNs, attributes, elem); - } - else - { - IEnumerable elems = obj as IEnumerable; - if (elems is object) - { - return RemoveNamespaceAttributes(inScopePrefixes, inScopeNs, attributes, elems); - } - } - } - - return obj; - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static IEnumerable RemoveNamespaceAttributes(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes, IEnumerable obj) - { - if (obj is object) - { - IEnumerable elems = obj as IEnumerable; - if (elems is object) - { - return elems.Select(new RemoveNamespaceAttributesClosure(inScopePrefixes, inScopeNs, attributes).ProcessXElement); - } - else - { - return obj.Cast().Select(new RemoveNamespaceAttributesClosure(inScopePrefixes, inScopeNs, attributes).ProcessObject); - } - } - - return obj; - } - - [DebuggerNonUserCode()] - [System.Runtime.CompilerServices.CompilerGenerated()] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - private sealed class RemoveNamespaceAttributesClosure - { - private readonly string[] m_inScopePrefixes; - private readonly XNamespace[] m_inScopeNs; - private readonly List m_attributes; - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal RemoveNamespaceAttributesClosure(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes) - { - m_inScopePrefixes = inScopePrefixes; - m_inScopeNs = inScopeNs; - m_attributes = attributes; - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal XElement ProcessXElement(XElement elem) - { - return RemoveNamespaceAttributes(m_inScopePrefixes, m_inScopeNs, m_attributes, elem); - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - internal object ProcessObject(object obj) - { - XElement elem = obj as XElement; - if (elem is object) - { - return RemoveNamespaceAttributes(m_inScopePrefixes, m_inScopeNs, m_attributes, elem); - } - else - { - return obj; - } - } - } - - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - public static XElement RemoveNamespaceAttributes(string[] inScopePrefixes, XNamespace[] inScopeNs, List attributes, XElement e) - { - if (e is object) - { - var a = e.FirstAttribute; - while (a is object) - { - var nextA = a.NextAttribute; - if (a.IsNamespaceDeclaration) - { - var ns = a.Annotation(); - string prefix = a.Name.LocalName; - if (ns is object) - { - if (inScopePrefixes is object && inScopeNs is object) - { - int lastIndex = inScopePrefixes.Length - 1; - for (int i = 0, loopTo = lastIndex; i <= loopTo; i++) - { - string currentInScopePrefix = inScopePrefixes[i]; - var currentInScopeNs = inScopeNs[i]; - if (prefix.Equals(currentInScopePrefix)) - { - if (ns == currentInScopeNs) - { - // prefix and namespace match. Remove the unneeded ns attribute - a.Remove(); - } - - // prefix is in scope but refers to something else. Leave the ns attribute. - a = null; - break; - } - } - } - - if (a is object) - { - // Prefix is not in scope - // Now check whether it's going to be in scope because it is in the attributes list - - if (attributes is object) - { - int lastIndex = attributes.Count - 1; - for (int i = 0, loopTo1 = lastIndex; i <= loopTo1; i++) - { - var currentA = attributes[i]; - string currentInScopePrefix = currentA.Name.LocalName; - var currentInScopeNs = currentA.Annotation(); - if (currentInScopeNs is object) - { - if (prefix.Equals(currentInScopePrefix)) - { - if (ns == currentInScopeNs) - { - // prefix and namespace match. Remove the unneeded ns attribute - a.Remove(); - } - - // prefix is in scope but refers to something else. Leave the ns attribute. - a = null; - break; - } - } - } - } - - if (a is object) - { - // Prefix is definitely not in scope - a.Remove(); - // namespace is not defined either. Add this attributes list - attributes.Add(a); - } - } - } - } - - a = nextA; - } - } - - return e; - } - } -} \ No newline at end of file diff --git a/Pilz.Updating/My Project/MyNamespace.Static.3.Designer.cs b/Pilz.Updating/My Project/MyNamespace.Static.3.Designer.cs deleted file mode 100644 index b2b5044..0000000 --- a/Pilz.Updating/My Project/MyNamespace.Static.3.Designer.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.VisualBasic -{ - [Embedded()] - [AttributeUsage(AttributeTargets.Class | AttributeTargets.Module | AttributeTargets.Assembly, Inherited = false)] - [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)] - [System.Runtime.CompilerServices.CompilerGenerated()] - internal sealed class Embedded : Attribute - { - } -} \ No newline at end of file diff --git a/Pilz.Updating/My Project/Resources.resx b/Pilz.Updating/My Project/Resources.resx deleted file mode 100644 index 1af7de1..0000000 --- a/Pilz.Updating/My Project/Resources.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Pilz.Updating/Pilz.Updating.csproj b/Pilz.Updating/Pilz.Updating.csproj index 34df616..ae79de3 100644 --- a/Pilz.Updating/Pilz.Updating.csproj +++ b/Pilz.Updating/Pilz.Updating.csproj @@ -1,8 +1,7 @@  Pilz.Updating - Windows - net6.0-windows + net6.0-windows;net8.0-windows $(DefaultItemExcludes);$(ProjectDir)**\*.vb latest Pilz.Updating @@ -39,8 +38,7 @@ True - 1.yyyy.Mdd.Hmm - 1.2023.1120.1828 + 2.0.0 @@ -59,10 +57,6 @@ - - True - Application.myapp - True True @@ -83,10 +77,6 @@ - - MyApplicationCodeGenerator - Application.Designer.cs - SettingsSingleFileGenerator Pilz.Updating.My diff --git a/Pilz.Updating/Properties/Resources.Designer.cs b/Pilz.Updating/Properties/Resources.Designer.cs index 9003737..26acd09 100644 --- a/Pilz.Updating/Properties/Resources.Designer.cs +++ b/Pilz.Updating/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Pilz.Updating.My.Resources { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources {