diff --git a/AwperativeKernel/AwperativeKernel.csproj b/AwperativeKernel/AwperativeKernel.csproj index 3debb06..51ffc08 100644 --- a/AwperativeKernel/AwperativeKernel.csproj +++ b/AwperativeKernel/AwperativeKernel.csproj @@ -10,4 +10,7 @@ + + + \ No newline at end of file diff --git a/AwperativeKernel/Kernel/ComponentDocker/Attributes/DockerOwns.cs b/AwperativeKernel/Kernel/Atrributes/AwperativeAttributes.cs similarity index 87% rename from AwperativeKernel/Kernel/ComponentDocker/Attributes/DockerOwns.cs rename to AwperativeKernel/Kernel/Atrributes/AwperativeAttributes.cs index b0049a1..bf232d3 100644 --- a/AwperativeKernel/Kernel/ComponentDocker/Attributes/DockerOwns.cs +++ b/AwperativeKernel/Kernel/Atrributes/AwperativeAttributes.cs @@ -293,6 +293,56 @@ public class ValueFitsRange : Attribute +/// +/// Requires that the index fits a given collection +/// +[AttributeUsage(AttributeTargets.All)] +public class CollectionContains : Attribute +{ + + + /// + /// Verifies if the value fits a range + /// + /// + /// + public static bool VerifyOrThrow<__Type>(__Type __object, ICollection<__Type> __collection) { + if(__collection.Contains(__object)) return true; + + Debug.LogError("Collection does not contain object!", ["ObjectType"], + [__object.GetType().Name]); + + return Awperative.IgnoreErrors; + } +} + + + +/// +/// Requires that the index fits a given collection +/// +[AttributeUsage(AttributeTargets.All)] +public class CollectionDoesntContain : Attribute +{ + + + /// + /// Verifies if the value fits a range + /// + /// + /// + public static bool VerifyOrThrow<__Type>(__Type __object, ICollection<__Type> __collection) { + if(!__collection.Contains(__object)) return true; + + Debug.LogError("Collection already contains object!", ["ObjectType"], + [__object.GetType().Name]); + + return Awperative.IgnoreErrors; + } +} + + + /// /// Shows that the given object is unsafe (ex. it doesn't check for null values and such, or it doesn't have guardrails based on cases). /// This is just for internal/private methods to remind myself how to call it :) The reasoning is case by case, but most of the time, diff --git a/AwperativeKernel/Kernel/Component/Component.cs b/AwperativeKernel/Kernel/Component/Component.cs index b15fb69..0bb47b0 100644 --- a/AwperativeKernel/Kernel/Component/Component.cs +++ b/AwperativeKernel/Kernel/Component/Component.cs @@ -19,7 +19,8 @@ public abstract partial class Component : ComponentDocker, IDisposable /// Current parent of the Component. Can be either Scene or another Component. - public ComponentDocker ComponentDocker { get; internal set; } = null; + [UnsafeInternal] + internal ComponentDocker ComponentDocker { get; set; } = null; /// @@ -29,7 +30,7 @@ public abstract partial class Component : ComponentDocker, IDisposable public string Name { get => _name; set { if (!NotNull.VerifyOrThrow(value)) return; _name = value; } - } private string _name; + } [UnsafeInternal] private string _name; /// Represents the state of this Component, The largest bit represents if the Component is enabled or not, while the @@ -38,14 +39,14 @@ public abstract partial class Component : ComponentDocker, IDisposable private byte OrderProfile; /// If the component receives time events or not. - [CalculatedProperty] [CalculatedPropertyExpense("Very Low")] + [CalculatedProperty, CalculatedPropertyExpense("Very Low")] public bool Enabled { get => (OrderProfile & 128) > 0; set => OrderProfile = (byte)((OrderProfile & 127) | (value ? 128 : 0)); } /// Represents the Component's Update priority, can be set to any value ranging from -64 to 63; otherwise an error will throw! - [CalculatedProperty] [CalculatedPropertyExpense("Very Low")] + [CalculatedProperty, CalculatedPropertyExpense("Very Low")] public int Priority { get => (sbyte)(OrderProfile << 1) >> 1; set { @@ -58,37 +59,23 @@ public abstract partial class Component : ComponentDocker, IDisposable - - - + /// - /// Scene the Component resides in. + /// Attempts to send an Event to the Component, terminates if the Component does not have the given Event /// - public Scene Scene => __QueryScene(); - protected Scene __QueryScene() { - if (ComponentDocker is Scene scene) return scene; - if (ComponentDocker is Component Component) return Component.__QueryScene(); - - return null; + /// Type of Event + [UnsafeInternal] + internal void TryEvent(int __timeEvent) { + Awperative._TypeAssociatedTimeEvents[GetType()][__timeEvent]?.Invoke(this); } - - - public void TryEvent(int __timeEvent) { - Action eventDelegates = Awperative._TypeAssociatedTimeEvents[GetType()][__timeEvent]; - eventDelegates?.Invoke(this); - } - - - - /// /// Identifiers for Components. /// - public ImmutableArray Tags => [.._tags]; - internal HashSet _tags = []; + public IReadOnlyList Tags => [.._tags]; + [UnsafeInternal] internal HashSet _tags = []; @@ -98,124 +85,37 @@ public abstract partial class Component : ComponentDocker, IDisposable /// Adds a new tag to the Component /// /// The tag to add - public void AddTag(string __tag) => ComponentDocker.HashTaggedComponent(this, __tag); - - - - - - /// - /// Removes a tag from the Component - /// - /// The tag to remove - public void RemoveTag(string __tag) => ComponentDocker.UnhashTaggedComponent(this, __tag); - - - - - - /// - /// All parent Dockers and the parents of the parents up until the Scene. Will only list parents of parents, not uncle dockers. - /// - /// Dockers[0] is the parent of this object, and Dockers[^1] is the Scene. - public ImmutableArray Dockers => __QueryDockers(); - protected ImmutableArray __QueryDockers() { - List returnValue = []; - ComponentDocker currentComponentDocker = ComponentDocker; - - while (!(currentComponentDocker is Scene)) { - if (currentComponentDocker is Component Component) { - returnValue.Add(currentComponentDocker); - currentComponentDocker = Component.ComponentDocker; - } else { - Debug.LogError("Component has a Parent that is not a Scene or Component, Please do not use the Docker class unless you know what you are doing!", ["Component", "Type", "Docker"], - [GetHashCode().ToString(), GetType().ToString(), ComponentDocker.GetHashCode().ToString()]); - } - } - - returnValue.Add(currentComponentDocker); - - return [..returnValue]; - } - - - - - - /// - /// Returns the Parent Component. Will be null if the Component is under a scene. - /// - public Component Parent => __QueryParent(); - protected Component __QueryParent() { - if (ComponentDocker is Component Component) - return Component; - return null; - } - - - - - - /// - /// All parent Components and the parents of the parents up until the Scene. Will only list parents of parents, not uncle Components. - /// - public ImmutableArray Parents => __QueryComponents(); - protected ImmutableArray __QueryComponents() { - List returnValue = []; - ComponentDocker currentComponentDocker = ComponentDocker; + public void AddTag([NotNull, CollectionDoesntContain] string __tag) + { + if(!NotNull.VerifyOrThrow(__tag)) return; + if(!CollectionDoesntContain.VerifyOrThrow(__tag, _tags)) return; - while (!(currentComponentDocker is Scene)) - if (currentComponentDocker is Component Component) { - returnValue.Add(Component); - currentComponentDocker = Component.ComponentDocker; - } - return [..returnValue]; + _tags.Add(__tag); + ComponentDocker.AddTagToComponent(__tag, this); } + + /// - /// Creates a new Scene + /// Adds a new tag to the Component /// - /// Name of the Scene - public Scene CreateScene(string __name) => Awperative.CreateScene(__name); - - - - /// - /// Finds a scene. - /// - /// Name of the Scene - /// - public Scene GetScene(string __name) => Awperative.GetScene(__name); - - - - /// - /// Destroys a Scene forever - /// - /// Target scene - public void RemoveScene(Scene __scene) => Awperative.CloseScene(__scene); - - - - /// - /// Destroys a Scene forever - /// - /// Name of the Scene - public void RemoveScene(string __name) => Awperative.CloseScene(__name); - - - - public ImmutableArray GetAllChildren() { - List targets = [.._components]; - for (int i = 0; i < targets.Count; i++) targets.InsertRange(i + 1, targets[i]._components); - return [..targets]; + /// The tag to add + public void RemoveTag([NotNull,CollectionContains] string __tag) + { + if (!NotNull.VerifyOrThrow(__tag)) return; + if(!CollectionContains.VerifyOrThrow(__tag, _tags)) return; + + _tags.Remove(__tag); + ComponentDocker.RemoveTagFromComponent(__tag, this); } + + + + - public virtual void Dispose() { - GC.SuppressFinalize(this); - } + public virtual void Dispose() { GC.SuppressFinalize(this); } public override string ToString() { return this.Name; diff --git a/AwperativeKernel/Kernel/Component/ComponentCalculatedProperty.cs b/AwperativeKernel/Kernel/Component/ComponentCalculatedProperty.cs new file mode 100644 index 0000000..37a05d2 --- /dev/null +++ b/AwperativeKernel/Kernel/Component/ComponentCalculatedProperty.cs @@ -0,0 +1,52 @@ +using System.Collections.Generic; + +namespace AwperativeKernel; + +public abstract partial class Component +{ + /// + /// Scene the Component resides in. + /// + [CalculatedProperty, CalculatedPropertyExpense("Medium: O(Parents)")] + public Scene Scene => __QueryScene(); + private Scene __QueryScene() { + if (ComponentDocker is Scene scene) return scene; + if (ComponentDocker is Component Component) return Component.__QueryScene(); + + return null; + } + + + + /// + /// Returns the Parent Component. Will be null if the Component is at the base of a scene. + /// + [CalculatedProperty, CalculatedPropertyExpense("Very Low O(1)")] + public Component Parent => __QueryParent(); + private Component __QueryParent() { + if (ComponentDocker is Component Component) + return Component; + return null; + } + + + + /// + /// All parent Components and the parents of the parents up until the Scene. Will only list parents of parents, not uncle Components. + /// + [CalculatedProperty, CalculatedPropertyExpense("Medium O(Parents)")] + public IReadOnlyList AllParents => __QueryComponents(); + private IReadOnlyList __QueryComponents() { + List returnValue = []; + ComponentDocker currentComponentDocker = ComponentDocker; + + while (!(currentComponentDocker is Scene)) + if (currentComponentDocker is Component Component) { + returnValue.Add(Component); + currentComponentDocker = Component.ComponentDocker; + } + return [..returnValue]; + } + + +} \ No newline at end of file diff --git a/AwperativeKernel/Kernel/Component/ComponentLambda.cs b/AwperativeKernel/Kernel/Component/ComponentLambda.cs new file mode 100644 index 0000000..0955931 --- /dev/null +++ b/AwperativeKernel/Kernel/Component/ComponentLambda.cs @@ -0,0 +1,32 @@ +namespace AwperativeKernel; + +public abstract partial class Component +{ + #region Scenes + + /// + public static Scene CreateScene(string __name) => Awperative.CreateScene(__name); + + + + /// + public static Scene GetScene(string __name) => Awperative.GetScene(__name); + + + + /// + public void RemoveScene(Scene __scene) => Awperative.CloseScene(__scene); + + + + /// + public void RemoveScene(string __name) => Awperative.CloseScene(__name); + + #endregion + + #region Components + + public void Move(ComponentDocker __newDocker) => ComponentDocker.Move(this, __newDocker); + + #endregion +} \ No newline at end of file diff --git a/AwperativeKernel/Kernel/ComponentDocker/Core/ComponentDocker.cs b/AwperativeKernel/Kernel/ComponentDocker/Core/ComponentDocker.cs index 343a24f..d9d4eef 100644 --- a/AwperativeKernel/Kernel/ComponentDocker/Core/ComponentDocker.cs +++ b/AwperativeKernel/Kernel/ComponentDocker/Core/ComponentDocker.cs @@ -20,17 +20,14 @@ public abstract partial class ComponentDocker : IEnumerable, IEnumerable - /// Core of Docker, contains all of our precious Components. Sorts them by their priorities with highest going first. - /// If they are equal it defaults to hash codes to ensure consistent Behavior - /// + /// Core of the Docker, holds all of the Components, sorted by update priority. - [UnsafeInternal] internal List _components = new(); + [UnsafeInternal] internal readonly List _components = []; /// Holds a list of Components at each of their types. This optimizes Get<Type> to O(1) - [UnsafeInternal] internal Dictionary> _componentTypeDictionary = new(); + [UnsafeInternal] internal readonly Dictionary> _componentTypeDictionary = new(); /// Stores a Component in a list at each of their tags. This optimizes Get(string tag) to O(1) - [UnsafeInternal] internal Dictionary> _componentTagDictionary = new(); + [UnsafeInternal] internal readonly Dictionary> _componentTagDictionary = new(); @@ -50,9 +47,6 @@ public abstract partial class ComponentDocker : IEnumerable, IEnumerable GetEnumerator() { return new ComponentDockEnum([.._components]); } - /// List of all Components belonging to the Docker, Please Use Add, Get, Move and Destroy to modify it - public IReadOnlyList Components => _components; - /// Amount of Components attached to the Docker public int Count => _components.Count; @@ -112,8 +106,8 @@ public abstract partial class ComponentDocker : IEnumerable, IEnumerable @@ -127,7 +121,7 @@ public abstract partial class ComponentDocker : IEnumerable, IEnumerable @@ -136,7 +130,7 @@ public abstract partial class ComponentDocker : IEnumerable, IEnumerableTag to add /// Component to add it to [UnsafeInternal] - private void AddTagToComponent(string __tag, Component __component) { + internal void AddTagToComponent(string __tag, Component __component) { if (!_componentTagDictionary.TryAdd(__tag, [__component])) _componentTagDictionary[__tag].Add(__component); } @@ -147,8 +141,29 @@ public abstract partial class ComponentDocker : IEnumerable, IEnumerableTag to remove /// Component to remove it from [UnsafeInternal] - private void RemoveTagFromComponent(string __tag, Component __component) { + internal void RemoveTagFromComponent(string __tag, Component __component) { if(!_componentTagDictionary.ContainsKey(__tag)) _componentTagDictionary[__tag].Remove(__component); } + + + + /// + /// All children belonging to the Component. + /// + [CalculatedProperty, CalculatedPropertyExpense("Very Low")] + public IReadOnlyList Children => _components; + + + + /// + /// All children and their children until the bottom of the scene. Uses Breadth First Search. + /// + [CalculatedProperty, CalculatedPropertyExpense("Medium O(Children)")] + public IReadOnlyList AllChildren => GetAllChildren(); + public IReadOnlyList GetAllChildren() { + List targets = [.._components]; + for (int i = 0; i < targets.Count; i++) targets.InsertRange(i + 1, targets[i]._components); + return [..targets]; + } } \ No newline at end of file diff --git a/AwperativeKernel/Kernel/ComponentDocker/Core/ComponentDockerManagement.cs b/AwperativeKernel/Kernel/ComponentDocker/Core/ComponentDockerManagement.cs index 3ad9a5c..144a4f0 100644 --- a/AwperativeKernel/Kernel/ComponentDocker/Core/ComponentDockerManagement.cs +++ b/AwperativeKernel/Kernel/ComponentDocker/Core/ComponentDockerManagement.cs @@ -48,11 +48,11 @@ public abstract partial class ComponentDocker /// Type of Component to instantiate /// Component cannot have a Constructor /// Avery Norris - public __Type Add<__Type>(string name = null, int priority = 0, Collection tags = null) where __Type : Component, new() { + public __Type Add<__Type>(string name = null, [ValueFitsRange] int priority = 0, Collection tags = null) where __Type : Component, new() { Component newComponent = new __Type(); newComponent.Name = name ??= typeof(__Type).Name; newComponent._tags = [..tags ??= []]; - newComponent._priority = priority; + newComponent.Priority = priority; InitiateComponent(newComponent); return (__Type)newComponent; } @@ -170,7 +170,7 @@ public abstract partial class ComponentDocker /// Destroys all Components from a given collection. /// /// - public void DestroyAll([ComponentNotNull, DockerOwns] Collection __Components) { for (var i = 0; i < __Components.Count; i++) Destroy(__Components[i]); } + public void DestroyAll([ComponentNotNull, DockerOwns] IReadOnlyList __Components) { for (var i = 0; i < __Components.Count; i++) Destroy(__Components[i]); } diff --git a/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.dgspec.json b/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.dgspec.json index 9bb9d23..93d3527 100644 --- a/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.dgspec.json +++ b/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.dgspec.json @@ -1,20 +1,20 @@ { "format": 1, "restore": { - "/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj": {} + "/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj": {} }, "projects": { - "/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj": { + "/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", + "projectUniqueName": "/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", "projectName": "AwperativeKernel", - "projectPath": "/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", - "packagesPath": "/home/avery/.nuget/packages/", - "outputPath": "/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/obj/", + "projectPath": "/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", + "packagesPath": "/Users/averynorris/.nuget/packages/", + "outputPath": "/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "/home/avery/.nuget/NuGet/NuGet.Config" + "/Users/averynorris/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ "net8.0" @@ -38,7 +38,7 @@ "auditLevel": "low", "auditMode": "direct" }, - "SdkAnalysisLevel": "9.0.300" + "SdkAnalysisLevel": "10.0.100" }, "frameworks": { "net8.0": { @@ -63,11 +63,11 @@ "downloadDependencies": [ { "name": "Microsoft.AspNetCore.App.Ref", - "version": "[8.0.24, 8.0.24]" + "version": "[8.0.23, 8.0.23]" }, { "name": "Microsoft.NETCore.App.Ref", - "version": "[8.0.24, 8.0.24]" + "version": "[8.0.23, 8.0.23]" } ], "frameworkReferences": { @@ -75,7 +75,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/home/avery/.dotnet/sdk/9.0.311/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.102/PortableRuntimeIdentifierGraph.json" } } } diff --git a/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.g.props b/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.g.props index 08dec0c..25b6aa4 100644 --- a/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.g.props +++ b/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.g.props @@ -4,12 +4,12 @@ True NuGet $(MSBuildThisFileDirectory)project.assets.json - /home/avery/.nuget/packages/ - /home/avery/.nuget/packages/ + /Users/averynorris/.nuget/packages/ + /Users/averynorris/.nuget/packages/ PackageReference - 6.14.0 + 7.0.0 - + \ No newline at end of file diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfo.cs b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfo.cs index 7d064cd..7e5e8ec 100644 --- a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfo.cs +++ b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("AwperativeKernel")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+89daba3278f3425069ad72c1e889e2d5c12ffebb")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+4a9f3d4476aad85ea81cf5539e1cbe307a50bee5")] [assembly: System.Reflection.AssemblyProductAttribute("AwperativeKernel")] [assembly: System.Reflection.AssemblyTitleAttribute("AwperativeKernel")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfoInputs.cache b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfoInputs.cache index 409b4e2..fa90c60 100644 --- a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfoInputs.cache +++ b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfoInputs.cache @@ -1 +1 @@ -fd20f709f0c09dd5820bb098e786f44ec3ff4e66593743fc97dd004440680728 +d26fbee268a2a19e12312d333a763a70899a64f6b3b49b30e13a2696cde111a2 diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.GeneratedMSBuildEditorConfig.editorconfig b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.GeneratedMSBuildEditorConfig.editorconfig index cbacfa1..cb335e2 100644 --- a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.GeneratedMSBuildEditorConfig.editorconfig +++ b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.GeneratedMSBuildEditorConfig.editorconfig @@ -1,5 +1,7 @@ is_global = true build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 build_property.TargetPlatformMinVersion = build_property.UsingMicrosoftNETSdkWeb = build_property.ProjectTypeGuids = @@ -8,7 +10,7 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Awperative -build_property.ProjectDir = /home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/ +build_property.ProjectDir = /Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/ build_property.EnableComHosting = build_property.EnableGeneratedComInterfaceComImportInterop = build_property.EffectiveAnalysisLevelStyle = 8.0 diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.assets.cache b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.assets.cache index 3412d35..8dcee15 100644 Binary files a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.assets.cache and b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.assets.cache differ diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.AssemblyReference.cache b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.AssemblyReference.cache index 2072822..2b06060 100644 Binary files a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.AssemblyReference.cache and b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.AssemblyReference.cache differ diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.CoreCompileInputs.cache b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.CoreCompileInputs.cache index 8423b84..7d8511c 100644 --- a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.CoreCompileInputs.cache +++ b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -fb1e5e1f7af8237ad8bd2d22975bb0a75e1f0b64faaaa35af565406d250bd296 +d99749faea945604824f7022f457f0974d512ed438f5f0cc6813de62d37d1f41 diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.FileListAbsolute.txt b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.FileListAbsolute.txt index 35172c4..c1bbc60 100644 --- a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.FileListAbsolute.txt +++ b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.FileListAbsolute.txt @@ -25,3 +25,11 @@ /home/avery/Projects/Awperative/Build/Kernel/net8.0/AwperativeKernel.deps.json /home/avery/Projects/Awperative/Build/Kernel/net8.0/AwperativeKernel.dll /home/avery/Projects/Awperative/Build/Kernel/net8.0/AwperativeKernel.pdb +/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.AssemblyReference.cache +/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.GeneratedMSBuildEditorConfig.editorconfig +/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfoInputs.cache +/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfo.cs +/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.csproj.CoreCompileInputs.cache +/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.dll +/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/Debug/net8.0/refint/AwperativeKernel.dll +/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.pdb diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.dll b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.dll index 89b7af5..d1cc6e9 100644 Binary files a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.dll and b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.dll differ diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.pdb b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.pdb index 8e3e3bf..4831b0d 100644 Binary files a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.pdb and b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.pdb differ diff --git a/AwperativeKernel/obj/project.assets.json b/AwperativeKernel/obj/project.assets.json index 40c44ad..b070dd3 100644 --- a/AwperativeKernel/obj/project.assets.json +++ b/AwperativeKernel/obj/project.assets.json @@ -442,19 +442,19 @@ ] }, "packageFolders": { - "/home/avery/.nuget/packages/": {} + "/Users/averynorris/.nuget/packages/": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", + "projectUniqueName": "/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", "projectName": "AwperativeKernel", - "projectPath": "/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", - "packagesPath": "/home/avery/.nuget/packages/", - "outputPath": "/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/obj/", + "projectPath": "/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", + "packagesPath": "/Users/averynorris/.nuget/packages/", + "outputPath": "/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "/home/avery/.nuget/NuGet/NuGet.Config" + "/Users/averynorris/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ "net8.0" @@ -478,7 +478,7 @@ "auditLevel": "low", "auditMode": "direct" }, - "SdkAnalysisLevel": "9.0.300" + "SdkAnalysisLevel": "10.0.100" }, "frameworks": { "net8.0": { @@ -503,11 +503,11 @@ "downloadDependencies": [ { "name": "Microsoft.AspNetCore.App.Ref", - "version": "[8.0.24, 8.0.24]" + "version": "[8.0.23, 8.0.23]" }, { "name": "Microsoft.NETCore.App.Ref", - "version": "[8.0.24, 8.0.24]" + "version": "[8.0.23, 8.0.23]" } ], "frameworkReferences": { @@ -515,7 +515,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/home/avery/.dotnet/sdk/9.0.311/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.102/PortableRuntimeIdentifierGraph.json" } } } diff --git a/AwperativeKernel/obj/project.nuget.cache b/AwperativeKernel/obj/project.nuget.cache index 6b1e1e9..009fa49 100644 --- a/AwperativeKernel/obj/project.nuget.cache +++ b/AwperativeKernel/obj/project.nuget.cache @@ -1,24 +1,24 @@ { "version": 2, - "dgSpecHash": "nvLY3cNblzg=", + "dgSpecHash": "LpP/nHq7BJc=", "success": true, - "projectFilePath": "/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", + "projectFilePath": "/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj", "expectedPackageFiles": [ - "/home/avery/.nuget/packages/opentk/5.0.0-pre.15/opentk.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.audio/5.0.0-pre.15/opentk.audio.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.compute/5.0.0-pre.15/opentk.compute.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.core/5.0.0-pre.15/opentk.core.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.graphics/5.0.0-pre.15/opentk.graphics.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.input/5.0.0-pre.15/opentk.input.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.mathematics/5.0.0-pre.15/opentk.mathematics.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.platform/5.0.0-pre.15/opentk.platform.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.redist.glfw/3.4.0.44/opentk.redist.glfw.3.4.0.44.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.windowing.common/5.0.0-pre.15/opentk.windowing.common.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.windowing.desktop/5.0.0-pre.15/opentk.windowing.desktop.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/opentk.windowing.graphicslibraryframework/5.0.0-pre.15/opentk.windowing.graphicslibraryframework.5.0.0-pre.15.nupkg.sha512", - "/home/avery/.nuget/packages/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512", - "/home/avery/.nuget/packages/microsoft.netcore.app.ref/8.0.24/microsoft.netcore.app.ref.8.0.24.nupkg.sha512", - "/home/avery/.nuget/packages/microsoft.aspnetcore.app.ref/8.0.24/microsoft.aspnetcore.app.ref.8.0.24.nupkg.sha512" + "/Users/averynorris/.nuget/packages/opentk/5.0.0-pre.15/opentk.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.audio/5.0.0-pre.15/opentk.audio.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.compute/5.0.0-pre.15/opentk.compute.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.core/5.0.0-pre.15/opentk.core.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.graphics/5.0.0-pre.15/opentk.graphics.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.input/5.0.0-pre.15/opentk.input.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.mathematics/5.0.0-pre.15/opentk.mathematics.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.platform/5.0.0-pre.15/opentk.platform.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.redist.glfw/3.4.0.44/opentk.redist.glfw.3.4.0.44.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.windowing.common/5.0.0-pre.15/opentk.windowing.common.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.windowing.desktop/5.0.0-pre.15/opentk.windowing.desktop.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/opentk.windowing.graphicslibraryframework/5.0.0-pre.15/opentk.windowing.graphicslibraryframework.5.0.0-pre.15.nupkg.sha512", + "/Users/averynorris/.nuget/packages/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512", + "/Users/averynorris/.nuget/packages/microsoft.netcore.app.ref/8.0.23/microsoft.netcore.app.ref.8.0.23.nupkg.sha512", + "/Users/averynorris/.nuget/packages/microsoft.aspnetcore.app.ref/8.0.23/microsoft.aspnetcore.app.ref.8.0.23.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/AwperativeKernel/obj/project.packagespec.json b/AwperativeKernel/obj/project.packagespec.json index b42190b..0a76f1a 100644 --- a/AwperativeKernel/obj/project.packagespec.json +++ b/AwperativeKernel/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj","projectName":"AwperativeKernel","projectPath":"/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj","outputPath":"/home/avery/Projects/Awperative/AwperativeKernel/AwperativeKernel/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net8.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"9.0.300"}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"OpenTK":{"target":"Package","version":"[5.0.0-pre.15, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Ref","version":"[8.0.24, 8.0.24]"},{"name":"Microsoft.NETCore.App.Ref","version":"[8.0.24, 8.0.24]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/home/avery/.dotnet/sdk/9.0.311/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file +"restore":{"projectUniqueName":"/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj","projectName":"AwperativeKernel","projectPath":"/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/AwperativeKernel.csproj","outputPath":"/Users/averynorris/RiderProjects/AwperativeKernel/AwperativeKernel/obj/","projectStyle":"PackageReference","originalTargetFrameworks":["net8.0"],"sources":{"https://api.nuget.org/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"},"SdkAnalysisLevel":"10.0.100"}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"OpenTK":{"target":"Package","version":"[5.0.0-pre.15, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"downloadDependencies":[{"name":"Microsoft.AspNetCore.App.Ref","version":"[8.0.23, 8.0.23]"},{"name":"Microsoft.NETCore.App.Ref","version":"[8.0.23, 8.0.23]"}],"frameworkReferences":{"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"/usr/local/share/dotnet/sdk/10.0.102/PortableRuntimeIdentifierGraph.json"}} \ No newline at end of file diff --git a/AwperativeKernel/obj/rider.project.model.nuget.info b/AwperativeKernel/obj/rider.project.model.nuget.info index 10e97b1..f9b028f 100644 --- a/AwperativeKernel/obj/rider.project.model.nuget.info +++ b/AwperativeKernel/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17713784696110717 \ No newline at end of file +17722910163812180 \ No newline at end of file diff --git a/AwperativeKernel/obj/rider.project.restore.info b/AwperativeKernel/obj/rider.project.restore.info index 10e97b1..1212d84 100644 --- a/AwperativeKernel/obj/rider.project.restore.info +++ b/AwperativeKernel/obj/rider.project.restore.info @@ -1 +1 @@ -17713784696110717 \ No newline at end of file +17722910991366692 \ No newline at end of file