diff --git a/.idea/.idea.AwperativeKernel/.idea/dictionaries/project.xml b/.idea/.idea.AwperativeKernel/.idea/dictionaries/project.xml index c7c65ce..b4c9e52 100644 --- a/.idea/.idea.AwperativeKernel/.idea/dictionaries/project.xml +++ b/.idea/.idea.AwperativeKernel/.idea/dictionaries/project.xml @@ -2,6 +2,7 @@ awlf + awperative awperative's diff --git a/AwperativeKernel/AwperativeKernel.csproj b/AwperativeKernel/AwperativeKernel.csproj index 1e43d1d..e8de8ab 100644 --- a/AwperativeKernel/AwperativeKernel.csproj +++ b/AwperativeKernel/AwperativeKernel.csproj @@ -5,8 +5,6 @@ Awperative - - All - + \ No newline at end of file diff --git a/AwperativeKernel/Kernel/Component/Component.cs b/AwperativeKernel/Kernel/Component/Component.cs index 834eaa1..f61ee9f 100644 --- a/AwperativeKernel/Kernel/Component/Component.cs +++ b/AwperativeKernel/Kernel/Component/Component.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Collections.Immutable; -using Microsoft.Xna.Framework; -namespace Awperative; + +namespace AwperativeKernel; @@ -134,9 +134,9 @@ public abstract partial class Component : ComponentDocker 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. /// @@ -194,4 +194,37 @@ public abstract partial class Component : ComponentDocker } return [..returnValue]; } + + + + /// + /// Creates a new Scene + /// + /// 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); } \ No newline at end of file diff --git a/AwperativeKernel/Kernel/ComponentDocker/ComponentDocker.cs b/AwperativeKernel/Kernel/ComponentDocker/ComponentDocker.cs index 2a4e794..87abefc 100644 --- a/AwperativeKernel/Kernel/ComponentDocker/ComponentDocker.cs +++ b/AwperativeKernel/Kernel/ComponentDocker/ComponentDocker.cs @@ -3,7 +3,9 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; -namespace Awperative; + + +namespace AwperativeKernel; /// /// Base class for all Awperative Entities. Responsible for Managing hierarchy between Components and Scenes, has Extensive Component Manipulation Available. diff --git a/AwperativeKernel/Kernel/Debug/Debug.cs b/AwperativeKernel/Kernel/Debug/Debug.cs index b11dfb9..d1fb2ba 100644 --- a/AwperativeKernel/Kernel/Debug/Debug.cs +++ b/AwperativeKernel/Kernel/Debug/Debug.cs @@ -5,7 +5,8 @@ using System.Linq; using System.Reflection; -namespace Awperative; + +namespace AwperativeKernel; public static class Debug diff --git a/AwperativeKernel/Kernel/Overhead/Awperative/Awperative.cs b/AwperativeKernel/Kernel/Overhead/Awperative/Awperative.cs index 91e6f06..828dcb4 100644 --- a/AwperativeKernel/Kernel/Overhead/Awperative/Awperative.cs +++ b/AwperativeKernel/Kernel/Overhead/Awperative/Awperative.cs @@ -1,14 +1,10 @@ using System.Collections.Generic; using System.Collections.Immutable; -using System.IO; using System.Linq; -using System.Reflection; -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Content; -using Microsoft.Xna.Framework.Graphics; -namespace Awperative; + +namespace AwperativeKernel; /// /// Initiating class of Awperative. Call Start() to start the kernel. @@ -24,33 +20,8 @@ public static class Awperative /// public static Base Base { get; internal set; } - - - - - /// - /// Handles graphics settings through MonoGame. - /// - public static GraphicsDeviceManager GraphicsDeviceManager { get; internal set; } - - - - /// - /// Handles drawing sprites to the screen through MonoGame. - /// - public static SpriteBatch SpriteBatch { get; internal set; } - - - - /// - /// Handles loading content through MonoGame. - /// - public static ContentManager ContentManager { get; internal set; } - - - - + /// /// List of all scenes currently loaded in the kernel. /// @@ -86,7 +57,7 @@ public static class Awperative /// /// Returns bool based on whether there a scene with the given name or not. /// - /// + /// Name of the Scene /// public static bool ContainsScene(string __name) => _scenes.Any(scene => scene.Name == __name); @@ -95,8 +66,16 @@ public static class Awperative /// /// Closes a Scene /// - /// - public static void CloseScene(Scene __scene) => Scenes.Remove(GetScene(__scene.Name)); + /// Scene to close + public static void CloseScene(Scene __scene) => Scenes.Remove(__scene); + + + + /// + /// Closes a Scene + /// + /// Name of the scene + public static void CloseScene(string __name) => Scenes.Remove(GetScene(__name)); diff --git a/AwperativeKernel/Kernel/Overhead/Base/Base.cs b/AwperativeKernel/Kernel/Overhead/Base/Base.cs index 29b9aac..efa70dd 100644 --- a/AwperativeKernel/Kernel/Overhead/Base/Base.cs +++ b/AwperativeKernel/Kernel/Overhead/Base/Base.cs @@ -1,42 +1,20 @@ -using System.Linq; -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Graphics; +using System.ComponentModel; +using System.Linq; +using OpenTK; +using OpenTK.Windowing.Common; +using OpenTK.Windowing.Desktop; -namespace Awperative; + +namespace AwperativeKernel; /// /// Base class of Awperative. Carries events from MonoGame into scenes and hooks. /// /// Avery Norris -public sealed class Base : Game +public sealed class Base() : GameWindow(GameWindowSettings.Default, new NativeWindowSettings() { }) { - - /// - /// Start of Awperative. Please do not try to call this. - /// - internal Base() { - Awperative.GraphicsDeviceManager = new GraphicsDeviceManager(this); - Content.RootDirectory = "Content"; - } - - - - - - /// - /// Initialize() is called when the program starts. Goes before LoadContent(). And prepares the kernel for use. - /// - /// It is recommended not to load content in Initialize() - protected override void Initialize() { - Awperative.ContentManager = Content; - Awperative.SpriteBatch = new SpriteBatch(GraphicsDevice); - - base.Initialize(); - } - - @@ -44,7 +22,7 @@ public sealed class Base : Game /// LoadContent() is called when the program starts; right after Initialize(). Override Load() in scripting tools or use hooks to call from this event. /// /// It is recommended to load content during LoadContent() - protected override void LoadContent() { foreach(Scene scene in Awperative.Scenes.ToList()) if(scene.Enabled) scene.ChainLoad(); } + protected override void OnLoad() { foreach(Scene scene in Awperative.Scenes.ToList()) if(scene.Enabled) scene.ChainLoad(); } @@ -54,7 +32,7 @@ public sealed class Base : Game /// Update() is called every frame; before Draw(). Override Update() in scripting tools to call from this event. /// /// Hooks are unable to receive both Update() and Draw() - protected override void Update(GameTime __gameTime) { foreach(Scene scene in Awperative.Scenes.ToList()) if(scene.Enabled) scene.ChainUpdate(); base.Update(__gameTime); } + protected override void OnUpdateFrame(FrameEventArgs __args) { foreach(Scene scene in Awperative.Scenes.ToList()) if(scene.Enabled) scene.ChainUpdate(); base.OnUpdateFrame(__args); } @@ -64,7 +42,7 @@ public sealed class Base : Game /// Draw() is called every frame; after Update(). Override Draw() in scripting tools to call from this event. /// /// Hooks are unable to receive both Update() and Draw() - protected override void Draw(GameTime __gameTime) { foreach(Scene scene in Awperative.Scenes.ToList()) if(scene.Enabled) scene.ChainDraw(); base.Draw(__gameTime); } + protected override void OnRenderFrame(FrameEventArgs __args) { foreach(Scene scene in Awperative.Scenes.ToList()) if(scene.Enabled) scene.ChainDraw(); base.OnRenderFrame(__args); } @@ -74,7 +52,7 @@ public sealed class Base : Game /// EndRun() is called if the program closes. Override Terminate() in scripting tools or use hooks to call from this event. /// /// This event may not trigger if the program is force closed. - protected override void EndRun() { foreach (Scene scene in Awperative.Scenes.ToList()) if(scene.Enabled) scene.ChainUnload(); } + protected override void OnClosing(CancelEventArgs __args) { foreach (Scene scene in Awperative.Scenes.ToList()) if(scene.Enabled) scene.ChainUnload(); base.OnClosing(__args); } diff --git a/AwperativeKernel/Kernel/Scene/Scene.cs b/AwperativeKernel/Kernel/Scene/Scene.cs index 8980d7e..58c9d56 100644 --- a/AwperativeKernel/Kernel/Scene/Scene.cs +++ b/AwperativeKernel/Kernel/Scene/Scene.cs @@ -1,10 +1,4 @@ - - -using System.Collections.Generic; -using System.Linq; -using Microsoft.Xna.Framework; - -namespace Awperative; +namespace AwperativeKernel; public sealed partial class Scene : ComponentDocker { diff --git a/AwperativeKernel/bin/Debug/net8.0/AwperativeKernel.dll b/AwperativeKernel/bin/Debug/net8.0/AwperativeKernel.dll index 636bc32..6d8ac64 100644 Binary files a/AwperativeKernel/bin/Debug/net8.0/AwperativeKernel.dll and b/AwperativeKernel/bin/Debug/net8.0/AwperativeKernel.dll differ diff --git a/AwperativeKernel/bin/Debug/net8.0/AwperativeKernel.pdb b/AwperativeKernel/bin/Debug/net8.0/AwperativeKernel.pdb index 78f5d5b..a13f65a 100644 Binary files a/AwperativeKernel/bin/Debug/net8.0/AwperativeKernel.pdb and b/AwperativeKernel/bin/Debug/net8.0/AwperativeKernel.pdb differ diff --git a/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.dgspec.json b/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.dgspec.json index 1bb880d..aaf61d5 100644 --- a/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.dgspec.json +++ b/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.dgspec.json @@ -44,10 +44,9 @@ "net8.0": { "targetAlias": "net8.0", "dependencies": { - "MonoGame.Framework.DesktopGL": { - "suppressParent": "All", + "OpenTK": { "target": "Package", - "version": "[3.8.*, )" + "version": "[5.0.0-pre.15, )" } }, "imports": [ diff --git a/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.g.targets b/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.g.targets index 6a2cdf1..3dc06ef 100644 --- a/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.g.targets +++ b/AwperativeKernel/obj/AwperativeKernel.csproj.nuget.g.targets @@ -1,6 +1,2 @@  - - - - - \ No newline at end of file + \ 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 4b0afb3..79add43 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+c81b942f2b46144917d85dfd8159eaa5d9120941")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abbfe285b60980c87843f0d8d7b4ea19917da2a8")] [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 e6db065..e11acd7 100644 --- a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfoInputs.cache +++ b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.AssemblyInfoInputs.cache @@ -1 +1 @@ -dc17c4d2751cab23a72eff8f845895fe7687377c833303531b3796ad7d0e9c0f +afcbbfcb5273145965d51705620a76d1fee510766d5b39f039949033afa2aa6e diff --git a/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.assets.cache b/AwperativeKernel/obj/Debug/net8.0/AwperativeKernel.assets.cache index 5abc302..3718f69 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 26465f8..2072822 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/project.assets.json b/AwperativeKernel/obj/project.assets.json index da0a830..d1ad896 100644 --- a/AwperativeKernel/obj/project.assets.json +++ b/AwperativeKernel/obj/project.assets.json @@ -2,274 +2,443 @@ "version": 3, "targets": { "net8.0": { - "MonoGame.Framework.DesktopGL/3.8.4.1": { + "OpenTK/5.0.0-pre.15": { "type": "package", "dependencies": { - "MonoGame.Library.OpenAL": "1.24.3.2", - "MonoGame.Library.SDL": "2.32.2.1", - "NVorbis": "0.10.4" + "OpenTK.Audio": "5.0.0-pre.15", + "OpenTK.Compute": "5.0.0-pre.15", + "OpenTK.Core": "5.0.0-pre.15", + "OpenTK.Graphics": "5.0.0-pre.15", + "OpenTK.Input": "5.0.0-pre.15", + "OpenTK.Mathematics": "5.0.0-pre.15", + "OpenTK.Platform": "5.0.0-pre.15", + "OpenTK.Windowing.Common": "5.0.0-pre.15", + "OpenTK.Windowing.Desktop": "5.0.0-pre.15", + "OpenTK.Windowing.GraphicsLibraryFramework": "5.0.0-pre.15" + } + }, + "OpenTK.Audio/5.0.0-pre.15": { + "type": "package", + "dependencies": { + "OpenTK.Core": "[5.0.0-pre.15, 6.0.0-pre)", + "OpenTK.Mathematics": "[5.0.0-pre.15, 6.0.0-pre)" }, "compile": { - "lib/net8.0/MonoGame.Framework.dll": { + "lib/net8.0/OpenTK.Audio.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Audio.dll": { + "related": ".pdb;.xml" + } + } + }, + "OpenTK.Compute/5.0.0-pre.15": { + "type": "package", + "compile": { + "lib/net8.0/OpenTK.Compute.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Compute.dll": { + "related": ".pdb;.xml" + } + } + }, + "OpenTK.Core/5.0.0-pre.15": { + "type": "package", + "compile": { + "lib/net8.0/OpenTK.Core.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Core.dll": { + "related": ".pdb;.xml" + } + } + }, + "OpenTK.Graphics/5.0.0-pre.15": { + "type": "package", + "dependencies": { + "OpenTK.Core": "[5.0.0-pre.15, 6.0.0-pre)", + "OpenTK.Mathematics": "[5.0.0-pre.15, 6.0.0-pre)" + }, + "compile": { + "lib/net8.0/OpenTK.Graphics.dll": { + "related": ".pdb" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Graphics.dll": { + "related": ".pdb" + } + } + }, + "OpenTK.Input/5.0.0-pre.15": { + "type": "package", + "compile": { + "lib/net8.0/OpenTK.Input.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Input.dll": { + "related": ".pdb;.xml" + } + } + }, + "OpenTK.Mathematics/5.0.0-pre.15": { + "type": "package", + "dependencies": { + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + }, + "compile": { + "lib/net8.0/OpenTK.Mathematics.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Mathematics.dll": { + "related": ".pdb;.xml" + } + } + }, + "OpenTK.Platform/5.0.0-pre.15": { + "type": "package", + "compile": { + "lib/net8.0/OpenTK.Platform.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Platform.dll": { + "related": ".pdb;.xml" + } + } + }, + "OpenTK.redist.glfw/3.4.0.44": { + "type": "package", + "compile": { + "lib/netstandard2.0/_._": {} + }, + "runtime": { + "lib/netstandard2.0/_._": {} + }, + "runtimeTargets": { + "runtimes/linux-x64/native/libglfw.so.3": { + "assetType": "native", + "rid": "linux-x64" + }, + "runtimes/osx-arm64/native/libglfw.3.dylib": { + "assetType": "native", + "rid": "osx-arm64" + }, + "runtimes/osx-x64/native/libglfw.3.dylib": { + "assetType": "native", + "rid": "osx-x64" + }, + "runtimes/win-x64/native/glfw3.dll": { + "assetType": "native", + "rid": "win-x64" + }, + "runtimes/win-x86/native/glfw3.dll": { + "assetType": "native", + "rid": "win-x86" + } + } + }, + "OpenTK.Windowing.Common/5.0.0-pre.15": { + "type": "package", + "dependencies": { + "OpenTK.Core": "[5.0.0-pre.15, 6.0.0-pre)", + "OpenTK.Mathematics": "[5.0.0-pre.15, 6.0.0-pre)" + }, + "compile": { + "lib/net8.0/OpenTK.Windowing.Common.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Windowing.Common.dll": { + "related": ".pdb;.xml" + } + } + }, + "OpenTK.Windowing.Desktop/5.0.0-pre.15": { + "type": "package", + "dependencies": { + "OpenTK.Core": "[5.0.0-pre.15, 6.0.0-pre)", + "OpenTK.Mathematics": "[5.0.0-pre.15, 6.0.0-pre)", + "OpenTK.Windowing.Common": "[5.0.0-pre.15, 6.0.0-pre)", + "OpenTK.Windowing.GraphicsLibraryFramework": "[5.0.0-pre.15, 6.0.0-pre)" + }, + "compile": { + "lib/net8.0/OpenTK.Windowing.Desktop.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Windowing.Desktop.dll": { + "related": ".pdb;.xml" + } + } + }, + "OpenTK.Windowing.GraphicsLibraryFramework/5.0.0-pre.15": { + "type": "package", + "dependencies": { + "OpenTK.Core": "[5.0.0-pre.15, 6.0.0-pre)", + "OpenTK.redist.glfw": "3.4.0.44" + }, + "compile": { + "lib/net8.0/OpenTK.Windowing.GraphicsLibraryFramework.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/OpenTK.Windowing.GraphicsLibraryFramework.dll": { + "related": ".pdb;.xml" + } + } + }, + "System.Runtime.CompilerServices.Unsafe/6.0.0": { + "type": "package", + "compile": { + "lib/net6.0/System.Runtime.CompilerServices.Unsafe.dll": { "related": ".xml" } }, "runtime": { - "lib/net8.0/MonoGame.Framework.dll": { + "lib/net6.0/System.Runtime.CompilerServices.Unsafe.dll": { "related": ".xml" } }, "build": { - "build/MonoGame.Framework.DesktopGL.targets": {} - } - }, - "MonoGame.Library.OpenAL/1.24.3.2": { - "type": "package", - "runtimeTargets": { - "runtimes/android-arm/native/libopenal.so": { - "assetType": "native", - "rid": "android-arm" - }, - "runtimes/android-arm64/native/libopenal.so": { - "assetType": "native", - "rid": "android-arm64" - }, - "runtimes/android-x64/native/libopenal.so": { - "assetType": "native", - "rid": "android-x64" - }, - "runtimes/android-x86/native/libopenal.so": { - "assetType": "native", - "rid": "android-x86" - }, - "runtimes/ios-arm64/native/libopenal.a": { - "assetType": "native", - "rid": "ios-arm64" - }, - "runtimes/iossimulator-arm64/native/libopenal.a": { - "assetType": "native", - "rid": "iossimulator-arm64" - }, - "runtimes/iossimulator-x64/native/libopenal.a": { - "assetType": "native", - "rid": "iossimulator-x64" - }, - "runtimes/linux-arm64/native/libopenal.so": { - "assetType": "native", - "rid": "linux-arm64" - }, - "runtimes/linux-x64/native/libopenal.so": { - "assetType": "native", - "rid": "linux-x64" - }, - "runtimes/osx/native/libopenal.dylib": { - "assetType": "native", - "rid": "osx" - }, - "runtimes/win-x64/native/openal.dll": { - "assetType": "native", - "rid": "win-x64" - } - } - }, - "MonoGame.Library.SDL/2.32.2.1": { - "type": "package", - "runtimeTargets": { - "runtimes/linux-x64/native/libSDL2-2.0.so.0": { - "assetType": "native", - "rid": "linux-x64" - }, - "runtimes/osx/native/libSDL2-2.0.0.dylib": { - "assetType": "native", - "rid": "osx" - }, - "runtimes/win-x64/native/SDL2.dll": { - "assetType": "native", - "rid": "win-x64" - } - } - }, - "NVorbis/0.10.4": { - "type": "package", - "dependencies": { - "System.Memory": "4.5.3", - "System.ValueTuple": "4.5.0" - }, - "compile": { - "lib/netstandard2.0/NVorbis.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/netstandard2.0/NVorbis.dll": { - "related": ".xml" - } - } - }, - "System.Memory/4.5.3": { - "type": "package", - "compile": { - "ref/netcoreapp2.1/_._": {} - }, - "runtime": { - "lib/netcoreapp2.1/_._": {} - } - }, - "System.ValueTuple/4.5.0": { - "type": "package", - "compile": { - "ref/netcoreapp2.0/_._": {} - }, - "runtime": { - "lib/netcoreapp2.0/_._": {} + "buildTransitive/netcoreapp3.1/_._": {} } } } }, "libraries": { - "MonoGame.Framework.DesktopGL/3.8.4.1": { - "sha512": "YybxIIT5+Ky78E/XdkS0glyluMr2EeDZwx2LqXULAOCqiKt1+aDrjPZaqLL5qpNgBcMEHUeZJ4YjWe4TAZlWLw==", + "OpenTK/5.0.0-pre.15": { + "sha512": "CDGbelIIaGCBNPekNqh/zQsy63q+PTrVOWWWi7A3d/QrHVd0T5nDhSqqJpD77Xs/qHFRDhL1C3+Qh5CDYJyzig==", "type": "package", - "path": "monogame.framework.desktopgl/3.8.4.1", + "path": "opentk/5.0.0-pre.15", "files": [ ".nupkg.metadata", ".signature.p7s", - "Icon.png", - "README-packages.md", - "build/MonoGame.Framework.DesktopGL.targets", - "lib/net8.0/MonoGame.Framework.dll", - "lib/net8.0/MonoGame.Framework.xml", - "monogame.framework.desktopgl.3.8.4.1.nupkg.sha512", - "monogame.framework.desktopgl.nuspec" + "icon.png", + "opentk.5.0.0-pre.15.nupkg.sha512", + "opentk.nuspec" ] }, - "MonoGame.Library.OpenAL/1.24.3.2": { - "sha512": "nGRsXQXs+NSUC3C5w90hFQfyKdZPpBnHnyg2w+Dw/2pUH7s+CoRWTJNYbzzdJf3+aeUvfvG4rTbFvMKDDj5olA==", + "OpenTK.Audio/5.0.0-pre.15": { + "sha512": "lX3FR1RvXz+xjEGl5MFvGWQg7M/z4qdeHB6vdI5F1K1ODyjeuDlSnEc7hjA9fSdmKKEq3K1yCcU4kGgs4UC0ZQ==", "type": "package", - "path": "monogame.library.openal/1.24.3.2", + "path": "opentk.audio/5.0.0-pre.15", "files": [ ".nupkg.metadata", ".signature.p7s", - "Icon.png", - "LICENSE", - "README.md", - "monogame.library.openal.1.24.3.2.nupkg.sha512", - "monogame.library.openal.nuspec", - "runtimes/android-arm/native/libopenal.so", - "runtimes/android-arm64/native/libopenal.so", - "runtimes/android-x64/native/libopenal.so", - "runtimes/android-x86/native/libopenal.so", - "runtimes/ios-arm64/native/libopenal.a", - "runtimes/iossimulator-arm64/native/libopenal.a", - "runtimes/iossimulator-x64/native/libopenal.a", - "runtimes/linux-arm64/native/libopenal.so", - "runtimes/linux-x64/native/libopenal.so", - "runtimes/osx/native/libopenal.dylib", - "runtimes/win-x64/native/openal.dll" + "docs/README.md", + "images/opentk-blue-hexagon.png", + "lib/net8.0/OpenTK.Audio.dll", + "lib/net8.0/OpenTK.Audio.pdb", + "lib/net8.0/OpenTK.Audio.xml", + "opentk.audio.5.0.0-pre.15.nupkg.sha512", + "opentk.audio.nuspec" ] }, - "MonoGame.Library.SDL/2.32.2.1": { - "sha512": "T4E2ppGlSTC2L9US1rxtdg3qTbarRzNId31xZoumUW9cf9Nq8nRQPMu9GzvZGrhfSySf0+UWPEj1rlicps+P/w==", + "OpenTK.Compute/5.0.0-pre.15": { + "sha512": "uaT2JJGUEvlLYwKga5/cxAm7LiFdRKPjpWPE6tnhg2fYzHwX/6WfVCXU9xvYRLUqYHZIU7dYzJOzlXFZuDZNAw==", "type": "package", - "path": "monogame.library.sdl/2.32.2.1", + "path": "opentk.compute/5.0.0-pre.15", "files": [ ".nupkg.metadata", ".signature.p7s", - "Icon.png", - "LICENSE.txt", - "README.md", - "monogame.library.sdl.2.32.2.1.nupkg.sha512", - "monogame.library.sdl.nuspec", - "runtimes/linux-x64/native/libSDL2-2.0.so.0", - "runtimes/osx/native/libSDL2-2.0.0.dylib", - "runtimes/win-x64/native/SDL2.dll" + "docs/README.md", + "images/opentk-blue-hexagon.png", + "lib/net8.0/OpenTK.Compute.dll", + "lib/net8.0/OpenTK.Compute.pdb", + "lib/net8.0/OpenTK.Compute.xml", + "opentk.compute.5.0.0-pre.15.nupkg.sha512", + "opentk.compute.nuspec" ] }, - "NVorbis/0.10.4": { - "sha512": "WYnil3DhQHzjCY0dM9I2B3r1vWip90AOuQd25KE4NrjPQBg0tBJFluRLm5YPnO5ZLDmwrfosY8jCQGQRmWI/Pg==", + "OpenTK.Core/5.0.0-pre.15": { + "sha512": "Y/sir5MXEoGB9b4bmCSXknEtjbBIoqaRaeW5XnhIvY8FWBEsxT21jqq5zF1/TXjyCdcNkcfzPq70T6P4FYE5uQ==", "type": "package", - "path": "nvorbis/0.10.4", + "path": "opentk.core/5.0.0-pre.15", "files": [ ".nupkg.metadata", ".signature.p7s", - "LICENSE", - "lib/net45/NVorbis.dll", - "lib/net45/NVorbis.xml", - "lib/netstandard2.0/NVorbis.dll", - "lib/netstandard2.0/NVorbis.xml", - "nvorbis.0.10.4.nupkg.sha512", - "nvorbis.nuspec" + "docs/README.md", + "images/opentk-blue-hexagon.png", + "lib/net8.0/OpenTK.Core.dll", + "lib/net8.0/OpenTK.Core.pdb", + "lib/net8.0/OpenTK.Core.xml", + "opentk.core.5.0.0-pre.15.nupkg.sha512", + "opentk.core.nuspec" ] }, - "System.Memory/4.5.3": { - "sha512": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==", + "OpenTK.Graphics/5.0.0-pre.15": { + "sha512": "0oobd6dbdmKazMiBtiExv8hzlcJIxkEAD/ozyGX2T0WYPCMv0iZXRqqFl/qJ+18tfhIGoQ7USIp5Sw9ZxhDgjA==", "type": "package", - "path": "system.memory/4.5.3", + "path": "opentk.graphics/5.0.0-pre.15", "files": [ ".nupkg.metadata", ".signature.p7s", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "lib/netcoreapp2.1/_._", - "lib/netstandard1.1/System.Memory.dll", - "lib/netstandard1.1/System.Memory.xml", - "lib/netstandard2.0/System.Memory.dll", - "lib/netstandard2.0/System.Memory.xml", - "ref/netcoreapp2.1/_._", - "system.memory.4.5.3.nupkg.sha512", - "system.memory.nuspec", - "useSharedDesignerContext.txt", - "version.txt" + "docs/README.md", + "images/opentk-blue-hexagon.png", + "lib/net8.0/OpenTK.Graphics.dll", + "lib/net8.0/OpenTK.Graphics.pdb", + "opentk.graphics.5.0.0-pre.15.nupkg.sha512", + "opentk.graphics.nuspec" ] }, - "System.ValueTuple/4.5.0": { - "sha512": "okurQJO6NRE/apDIP23ajJ0hpiNmJ+f0BwOlB/cSqTLQlw5upkf+5+96+iG2Jw40G1fCVCyPz/FhIABUjMR+RQ==", + "OpenTK.Input/5.0.0-pre.15": { + "sha512": "O30U9gMveJW6bYPxxC7nYZVoViwlxpImMnIuWywcd1JnUfvScgDlWFwhPO7xBdaPu8FYa29N0yBRsl5eJufPcg==", "type": "package", - "path": "system.valuetuple/4.5.0", + "path": "opentk.input/5.0.0-pre.15", "files": [ ".nupkg.metadata", ".signature.p7s", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "lib/MonoAndroid10/_._", - "lib/MonoTouch10/_._", - "lib/net461/System.ValueTuple.dll", - "lib/net461/System.ValueTuple.xml", - "lib/net47/System.ValueTuple.dll", - "lib/net47/System.ValueTuple.xml", - "lib/netcoreapp2.0/_._", - "lib/netstandard1.0/System.ValueTuple.dll", - "lib/netstandard1.0/System.ValueTuple.xml", + "docs/README.md", + "images/opentk-blue-hexagon.png", + "lib/net8.0/OpenTK.Input.dll", + "lib/net8.0/OpenTK.Input.pdb", + "lib/net8.0/OpenTK.Input.xml", + "opentk.input.5.0.0-pre.15.nupkg.sha512", + "opentk.input.nuspec" + ] + }, + "OpenTK.Mathematics/5.0.0-pre.15": { + "sha512": "JFflFJNMLV0E/08bqsnzNXU/aUJJwy8xCZVU1ECMFvi1lKoCXi/FHSLJKW+s+p+bbTZ6HpPzdc+o4TBerecrjQ==", + "type": "package", + "path": "opentk.mathematics/5.0.0-pre.15", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "docs/README.md", + "images/opentk-blue-hexagon.png", + "lib/net8.0/OpenTK.Mathematics.dll", + "lib/net8.0/OpenTK.Mathematics.pdb", + "lib/net8.0/OpenTK.Mathematics.xml", + "opentk.mathematics.5.0.0-pre.15.nupkg.sha512", + "opentk.mathematics.nuspec" + ] + }, + "OpenTK.Platform/5.0.0-pre.15": { + "sha512": "5GCXACJm8ybTrumj2jb7c5oGNQyb/LwWCNbJsl72IeY/miBTMBPXM0RD8oXBXd/oH36pKz5EwzaRl/MT6/WajA==", + "type": "package", + "path": "opentk.platform/5.0.0-pre.15", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "lib/net8.0/OpenTK.Platform.dll", + "lib/net8.0/OpenTK.Platform.pdb", + "lib/net8.0/OpenTK.Platform.xml", + "opentk.platform.5.0.0-pre.15.nupkg.sha512", + "opentk.platform.nuspec" + ] + }, + "OpenTK.redist.glfw/3.4.0.44": { + "sha512": "HEjbdk0wWxSRrXHl3DSmrA8trecndgJpAHHloJJ1vPseNfeu/ynmrH/LturU1KguRn4r3IzZ81UIp5xRjnyahg==", + "type": "package", + "path": "opentk.redist.glfw/3.4.0.44", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "COPYING.md", "lib/netstandard2.0/_._", - "lib/portable-net40+sl4+win8+wp8/System.ValueTuple.dll", - "lib/portable-net40+sl4+win8+wp8/System.ValueTuple.xml", - "lib/uap10.0.16299/_._", - "lib/xamarinios10/_._", - "lib/xamarinmac20/_._", - "lib/xamarintvos10/_._", - "lib/xamarinwatchos10/_._", - "ref/MonoAndroid10/_._", - "ref/MonoTouch10/_._", - "ref/net461/System.ValueTuple.dll", - "ref/net47/System.ValueTuple.dll", - "ref/netcoreapp2.0/_._", - "ref/netstandard2.0/_._", - "ref/portable-net40+sl4+win8+wp8/System.ValueTuple.dll", - "ref/uap10.0.16299/_._", - "ref/xamarinios10/_._", - "ref/xamarinmac20/_._", - "ref/xamarintvos10/_._", - "ref/xamarinwatchos10/_._", - "system.valuetuple.4.5.0.nupkg.sha512", - "system.valuetuple.nuspec", - "useSharedDesignerContext.txt", - "version.txt" + "opentk.png", + "opentk.redist.glfw.3.4.0.44.nupkg.sha512", + "opentk.redist.glfw.nuspec", + "runtimes/linux-x64/native/libglfw.so.3", + "runtimes/osx-arm64/native/libglfw.3.dylib", + "runtimes/osx-x64/native/libglfw.3.dylib", + "runtimes/win-x64/native/glfw3.dll", + "runtimes/win-x86/native/glfw3.dll" + ] + }, + "OpenTK.Windowing.Common/5.0.0-pre.15": { + "sha512": "wPoz4uW8f3/zNHFVSWgMQPx5yhzUBKlpwdJp5PDiemZyO63tBJKaaty3TIJakDDdG/TioSIjnQb0YY1tEBkjuA==", + "type": "package", + "path": "opentk.windowing.common/5.0.0-pre.15", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "docs/README.md", + "images/opentk-blue-hexagon.png", + "lib/net8.0/OpenTK.Windowing.Common.dll", + "lib/net8.0/OpenTK.Windowing.Common.pdb", + "lib/net8.0/OpenTK.Windowing.Common.xml", + "opentk.windowing.common.5.0.0-pre.15.nupkg.sha512", + "opentk.windowing.common.nuspec" + ] + }, + "OpenTK.Windowing.Desktop/5.0.0-pre.15": { + "sha512": "Er5s+lSp5VwJ5NzrSjRMmhBpZdVGEFswuIE+joGtTUtIzznws6/Owi30tBaAC/byHHPrgH5hGegwlvEP5rDKRA==", + "type": "package", + "path": "opentk.windowing.desktop/5.0.0-pre.15", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "docs/README.md", + "images/opentk-blue-hexagon.png", + "lib/net8.0/OpenTK.Windowing.Desktop.dll", + "lib/net8.0/OpenTK.Windowing.Desktop.pdb", + "lib/net8.0/OpenTK.Windowing.Desktop.xml", + "opentk.windowing.desktop.5.0.0-pre.15.nupkg.sha512", + "opentk.windowing.desktop.nuspec" + ] + }, + "OpenTK.Windowing.GraphicsLibraryFramework/5.0.0-pre.15": { + "sha512": "o+t3c2tFiNpqkvTZ1tKw+Anjm76t+OvkiBVHUuSQ5WMBI/O+uzpZYEl0pdSRDpL3UT3udJkM8iefIqK2+YzAxA==", + "type": "package", + "path": "opentk.windowing.graphicslibraryframework/5.0.0-pre.15", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "docs/README.md", + "images/opentk-blue-hexagon.png", + "lib/net8.0/OpenTK.Windowing.GraphicsLibraryFramework.dll", + "lib/net8.0/OpenTK.Windowing.GraphicsLibraryFramework.pdb", + "lib/net8.0/OpenTK.Windowing.GraphicsLibraryFramework.xml", + "opentk.windowing.graphicslibraryframework.5.0.0-pre.15.nupkg.sha512", + "opentk.windowing.graphicslibraryframework.nuspec" + ] + }, + "System.Runtime.CompilerServices.Unsafe/6.0.0": { + "sha512": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==", + "type": "package", + "path": "system.runtime.compilerservices.unsafe/6.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/netcoreapp2.0/System.Runtime.CompilerServices.Unsafe.targets", + "buildTransitive/netcoreapp3.1/_._", + "lib/net461/System.Runtime.CompilerServices.Unsafe.dll", + "lib/net461/System.Runtime.CompilerServices.Unsafe.xml", + "lib/net6.0/System.Runtime.CompilerServices.Unsafe.dll", + "lib/net6.0/System.Runtime.CompilerServices.Unsafe.xml", + "lib/netcoreapp3.1/System.Runtime.CompilerServices.Unsafe.dll", + "lib/netcoreapp3.1/System.Runtime.CompilerServices.Unsafe.xml", + "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll", + "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.xml", + "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512", + "system.runtime.compilerservices.unsafe.nuspec", + "useSharedDesignerContext.txt" ] } }, "projectFileDependencyGroups": { "net8.0": [ - "MonoGame.Framework.DesktopGL >= 3.8.*" + "OpenTK >= 5.0.0-pre.15" ] }, "packageFolders": { @@ -315,10 +484,9 @@ "net8.0": { "targetAlias": "net8.0", "dependencies": { - "MonoGame.Framework.DesktopGL": { - "suppressParent": "All", + "OpenTK": { "target": "Package", - "version": "[3.8.*, )" + "version": "[5.0.0-pre.15, )" } }, "imports": [ diff --git a/AwperativeKernel/obj/project.nuget.cache b/AwperativeKernel/obj/project.nuget.cache index 4cca111..56d02b6 100644 --- a/AwperativeKernel/obj/project.nuget.cache +++ b/AwperativeKernel/obj/project.nuget.cache @@ -1,15 +1,22 @@ { "version": 2, - "dgSpecHash": "aH9ae8q0knA=", + "dgSpecHash": "8wMApkegGBo=", "success": true, "projectFilePath": "/home/avery/Programming/Awperative/AwperativeKernel/AwperativeKernel.csproj", "expectedPackageFiles": [ - "/home/avery/.nuget/packages/monogame.framework.desktopgl/3.8.4.1/monogame.framework.desktopgl.3.8.4.1.nupkg.sha512", - "/home/avery/.nuget/packages/monogame.library.openal/1.24.3.2/monogame.library.openal.1.24.3.2.nupkg.sha512", - "/home/avery/.nuget/packages/monogame.library.sdl/2.32.2.1/monogame.library.sdl.2.32.2.1.nupkg.sha512", - "/home/avery/.nuget/packages/nvorbis/0.10.4/nvorbis.0.10.4.nupkg.sha512", - "/home/avery/.nuget/packages/system.memory/4.5.3/system.memory.4.5.3.nupkg.sha512", - "/home/avery/.nuget/packages/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg.sha512", + "/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" ], diff --git a/AwperativeKernel/obj/project.packagespec.json b/AwperativeKernel/obj/project.packagespec.json index 9808096..38f71ba 100644 --- a/AwperativeKernel/obj/project.packagespec.json +++ b/AwperativeKernel/obj/project.packagespec.json @@ -1 +1 @@ -"restore":{"projectUniqueName":"/home/avery/Programming/Awperative/AwperativeKernel/AwperativeKernel.csproj","projectName":"AwperativeKernel","projectPath":"/home/avery/Programming/Awperative/AwperativeKernel/AwperativeKernel.csproj","outputPath":"/home/avery/Programming/Awperative/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":{"MonoGame.Framework.DesktopGL":{"suppressParent":"All","target":"Package","version":"[3.8.*, )"}},"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":"/home/avery/Programming/Awperative/AwperativeKernel/AwperativeKernel.csproj","projectName":"AwperativeKernel","projectPath":"/home/avery/Programming/Awperative/AwperativeKernel/AwperativeKernel.csproj","outputPath":"/home/avery/Programming/Awperative/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 diff --git a/AwperativeKernel/obj/rider.project.model.nuget.info b/AwperativeKernel/obj/rider.project.model.nuget.info index a11ffd7..631c2fb 100644 --- a/AwperativeKernel/obj/rider.project.model.nuget.info +++ b/AwperativeKernel/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17712657192032735 \ No newline at end of file +17713770221219736 \ No newline at end of file diff --git a/AwperativeKernel/obj/rider.project.restore.info b/AwperativeKernel/obj/rider.project.restore.info index 1963f8f..91f1cd1 100644 --- a/AwperativeKernel/obj/rider.project.restore.info +++ b/AwperativeKernel/obj/rider.project.restore.info @@ -1 +1 @@ -17712826495735493 \ No newline at end of file +17713770226351402 \ No newline at end of file