diff --git a/.vs/Firebird2D/DesignTimeBuild/.dtbcache.v2 b/.vs/Firebird2D/DesignTimeBuild/.dtbcache.v2 index 5a113d9..b2f1499 100644 Binary files a/.vs/Firebird2D/DesignTimeBuild/.dtbcache.v2 and b/.vs/Firebird2D/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/Firebird2D/v17/.futdcache.v2 b/.vs/Firebird2D/v17/.futdcache.v2 index 58a806a..1476eae 100644 Binary files a/.vs/Firebird2D/v17/.futdcache.v2 and b/.vs/Firebird2D/v17/.futdcache.v2 differ diff --git a/.vs/Firebird2D/v17/.suo b/.vs/Firebird2D/v17/.suo index 2afb6cf..2bc41bc 100644 Binary files a/.vs/Firebird2D/v17/.suo and b/.vs/Firebird2D/v17/.suo differ diff --git a/.vs/Firebird2D/v17/DocumentLayout.json b/.vs/Firebird2D/v17/DocumentLayout.json index cd54b67..bea62c4 100644 --- a/.vs/Firebird2D/v17/DocumentLayout.json +++ b/.vs/Firebird2D/v17/DocumentLayout.json @@ -3,8 +3,28 @@ "WorkspaceRootPath": "G:\\Coding\\Firebird2D\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|g:\\coding\\firebird2d\\firebird2d\\game.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|solutionrelative:firebird2d\\game.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{567FA588-5EE8-4B36-9C81-47C76C46D782}|Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj|g:\\coding\\firebird2d\\firebird2d.sfmlextensions\\floatrectangeextension.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{567FA588-5EE8-4B36-9C81-47C76C46D782}|Firebird2D.SFMLExtensions\\Firebird2D.SFMLExtensions.csproj|solutionrelative:firebird2d.sfmlextensions\\floatrectangeextension.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{AF025062-8AED-4E0B-91A4-CD4245F9DB46}|Firebird2D.Requirement\\Firebird2D.Requirement.csproj|g:\\coding\\firebird2d\\firebird2d.requirement\\require.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{AF025062-8AED-4E0B-91A4-CD4245F9DB46}|Firebird2D.Requirement\\Firebird2D.Requirement.csproj|solutionrelative:firebird2d.requirement\\require.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|g:\\coding\\firebird2d\\firebird2d.logger\\ilogger.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|solutionrelative:firebird2d.logger\\ilogger.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|g:\\coding\\firebird2d\\firebird2d.logger\\gamelogger.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|solutionrelative:firebird2d.logger\\gamelogger.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{7F6F9690-3BD3-4D44-BE62-3A7282DA671D}|FireBird2D.Interfaces\\FireBird2D.Interfaces.csproj|g:\\coding\\firebird2d\\firebird2d.interfaces\\igame.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{7F6F9690-3BD3-4D44-BE62-3A7282DA671D}|FireBird2D.Interfaces\\FireBird2D.Interfaces.csproj|solutionrelative:firebird2d.interfaces\\igame.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{38CCA723-C113-4E44-B074-F9B709B0EEB4}|Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj|g:\\coding\\firebird2d\\firebird2d.keymapper\\firebird2d.keymapping.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", + "RelativeMoniker": "D:0:0:{38CCA723-C113-4E44-B074-F9B709B0EEB4}|Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj|solutionrelative:firebird2d.keymapper\\firebird2d.keymapping.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" }, { "AbsoluteMoniker": "D:0:0:{38CCA723-C113-4E44-B074-F9B709B0EEB4}|Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj|g:\\coding\\firebird2d\\firebird2d.keymapper\\keymapper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", @@ -14,22 +34,6 @@ "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\firebirdevent.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\firebirdevent.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, - { - "AbsoluteMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|g:\\coding\\firebird2d\\firebird2d\\core\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|solutionrelative:firebird2d\\core\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|g:\\coding\\firebird2d\\firebird2d\\core\\inputmapper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|solutionrelative:firebird2d\\core\\inputmapper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|g:\\coding\\firebird2d\\firebird2d.logger\\firebird2d.logger.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|", - "RelativeMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|solutionrelative:firebird2d.logger\\firebird2d.logger.csproj||{FA3CD31E-987B-443A-9B81-186104E8DAC1}|" - }, - { - "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\eventbus.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\eventbus.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, { "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\pipeline.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\pipeline.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -38,17 +42,41 @@ "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\i_pipeline.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\i_pipeline.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\eventbus.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\eventbus.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\eventarguments\\firebirdjoystickbuttoneventargs.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\eventarguments\\firebirdjoystickbuttoneventargs.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\eventarguments\\firebirdkeyeventargs.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\eventarguments\\firebirdkeyeventargs.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\eventarguments\\firebirdmousebuttoneventargs.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\eventarguments\\firebirdmousebuttoneventargs.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|g:\\coding\\firebird2d\\firebird2d\\core\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|solutionrelative:firebird2d\\core\\mainwindow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|g:\\coding\\firebird2d\\firebird2d.eventpipelines\\eventarguments\\inputeventtype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FB2B6835-02BF-4AE7-B85F-290472787ED3}|Firebird2D.EventPipelines\\Firebird2D.EventPipelines.csproj|solutionrelative:firebird2d.eventpipelines\\eventarguments\\inputeventtype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|g:\\coding\\firebird2d\\firebird2d\\game.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|solutionrelative:firebird2d\\game.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|g:\\coding\\firebird2d\\firebird2d\\core\\inputmapper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{487A2EF7-6F5F-4F03-B355-82EF8BA45530}|Firebird2D\\Firebird2D.csproj|solutionrelative:firebird2d\\core\\inputmapper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{8B04689D-A8E2-494B-922E-06F5EF313297}|Documentation{8B04689D-A8E2-494B-922E-06F5EF313297}|G:\\Coding\\Firebird2D\\ClassDiagram.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}", "RelativeMoniker": "D:0:0:{8B04689D-A8E2-494B-922E-06F5EF313297}|Documentation{8B04689D-A8E2-494B-922E-06F5EF313297}|solutionrelative:ClassDiagram.md||{EFC0BB08-EA7D-40C6-A696-C870411A895B}" - }, - { - "AbsoluteMoniker": "D:0:0:{AF025062-8AED-4E0B-91A4-CD4245F9DB46}|Firebird2D.Requirement\\Firebird2D.Requirement.csproj|g:\\coding\\firebird2d\\firebird2d.requirement\\require.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{AF025062-8AED-4E0B-91A4-CD4245F9DB46}|Firebird2D.Requirement\\Firebird2D.Requirement.csproj|solutionrelative:firebird2d.requirement\\require.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|g:\\coding\\firebird2d\\firebird2d.logger\\gamelogger.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{106D6D21-E153-476B-AE52-4B2C899F6928}|Firebird2D.Logger\\Firebird2D.Logger.csproj|solutionrelative:firebird2d.logger\\gamelogger.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -58,24 +86,63 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 8, + "SelectedChildIndex": 0, "Children": [ + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "FloatRectangeExtension.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\FloatRectangeExtension.cs", + "RelativeDocumentMoniker": "Firebird2D.SFMLExtensions\\FloatRectangeExtension.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.SFMLExtensions\\FloatRectangeExtension.cs", + "RelativeToolTip": "Firebird2D.SFMLExtensions\\FloatRectangeExtension.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABYAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-21T17:17:44.48Z", + "EditorCaption": "" + }, { "$type": "Document", "DocumentIndex": 5, - "Title": "Firebird2D.Logger", - "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", - "RelativeDocumentMoniker": "Firebird2D.Logger\\Firebird2D.Logger.csproj", - "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", - "RelativeToolTip": "Firebird2D.Logger\\Firebird2D.Logger.csproj", + "Title": "Firebird2D.KeyMapping", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj", + "RelativeDocumentMoniker": "Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj", + "RelativeToolTip": "Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj", "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000758|", - "WhenOpened": "2025-04-18T19:04:18.723Z", + "WhenOpened": "2025-04-21T17:12:47.964Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "ILogger.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\ILogger.cs", + "RelativeDocumentMoniker": "Firebird2D.Logger\\ILogger.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\ILogger.cs", + "RelativeToolTip": "Firebird2D.Logger\\ILogger.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAwAAAANAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-21T17:12:31.494Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 4, + "Title": "IGame.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\IGame.cs", + "RelativeDocumentMoniker": "FireBird2D.Interfaces\\IGame.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\IGame.cs", + "RelativeToolTip": "FireBird2D.Interfaces\\IGame.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAoAAAAFAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-21T16:58:17.745Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 17, "Title": "InputMapper.cs", "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D\\Core\\InputMapper.cs", "RelativeDocumentMoniker": "Firebird2D\\Core\\InputMapper.cs", @@ -88,85 +155,85 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 14, "Title": "MainWindow.cs", "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D\\Core\\MainWindow.cs", "RelativeDocumentMoniker": "Firebird2D\\Core\\MainWindow.cs", "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D\\Core\\MainWindow.cs", "RelativeToolTip": "Firebird2D\\Core\\MainWindow.cs", - "ViewState": "AQIAAAwAAAAAAAAAAAAAAFUAAAAwAAAA", + "ViewState": "AQIAAA4AAAAAAAAAAAAAwCcAAAAJAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-04-18T07:43:27.389Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 6, "Title": "KeyMapper.cs", "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\KeyMapper.cs", "RelativeDocumentMoniker": "Firebird2D.KeyMapper\\KeyMapper.cs", "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\KeyMapper.cs", "RelativeToolTip": "Firebird2D.KeyMapper\\KeyMapper.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAUAAAAAAAAA", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABAAAAA+AAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-04-18T07:43:14.35Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 9, "Title": "I_Pipeline.cs", "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\I_Pipeline.cs", "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\I_Pipeline.cs", "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\I_Pipeline.cs", "RelativeToolTip": "Firebird2D.EventPipelines\\I_Pipeline.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAABEAAAAAAAAA", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAB4AAABbAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-04-17T20:10:17.86Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 8, "Title": "Pipeline.cs", "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Pipeline.cs", "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\Pipeline.cs", "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\Pipeline.cs", "RelativeToolTip": "Firebird2D.EventPipelines\\Pipeline.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAABsAAAAAAAAA", + "ViewState": "AQIAABYAAAAAAAAAAAAQwEsAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-04-17T19:45:23.048Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 7, "Title": "FirebirdEvent.cs", "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\FirebirdEvent.cs", "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\FirebirdEvent.cs", "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\FirebirdEvent.cs", "RelativeToolTip": "Firebird2D.EventPipelines\\FirebirdEvent.cs", - "ViewState": "AQIAAH8BAAAAAAAAAAAAwK4BAAAVAAAA", + "ViewState": "AQIAAE8BAAAAAAAAAAAAwK4BAAAVAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-04-17T19:42:10.988Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 10, "Title": "EventBus.cs", "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventBus.cs", "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\EventBus.cs", "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventBus.cs", "RelativeToolTip": "Firebird2D.EventPipelines\\EventBus.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAACMAAAAJAAAA", + "ViewState": "AQIAACIAAAAAAAAAAAAQwCMAAAANAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-04-17T19:40:01.999Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 16, "Title": "Game.cs", "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D\\Game.cs", "RelativeDocumentMoniker": "Firebird2D\\Game.cs", @@ -179,7 +246,85 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 3, + "Title": "GameLogger.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\GameLogger.cs", + "RelativeDocumentMoniker": "Firebird2D.Logger\\GameLogger.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\GameLogger.cs", + "RelativeToolTip": "Firebird2D.Logger\\GameLogger.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABUAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-17T17:56:23.324Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "Require.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Require.cs", + "RelativeDocumentMoniker": "Firebird2D.Requirement\\Require.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Require.cs", + "RelativeToolTip": "Firebird2D.Requirement\\Require.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAcAAAAFAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-17T17:56:35.49Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 12, + "Title": "FirebirdKeyEventArgs.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventArguments\\FirebirdKeyEventArgs.cs", + "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\EventArguments\\FirebirdKeyEventArgs.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventArguments\\FirebirdKeyEventArgs.cs", + "RelativeToolTip": "Firebird2D.EventPipelines\\EventArguments\\FirebirdKeyEventArgs.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAsAAABCAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-20T12:39:14.001Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 15, + "Title": "InputEventType.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventArguments\\InputEventType.cs", + "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\EventArguments\\InputEventType.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventArguments\\InputEventType.cs", + "RelativeToolTip": "Firebird2D.EventPipelines\\EventArguments\\InputEventType.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAwAAAAFAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-20T12:41:00.332Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 13, + "Title": "FirebirdMouseButtonEventArgs.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventArguments\\FirebirdMouseButtonEventArgs.cs", + "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\EventArguments\\FirebirdMouseButtonEventArgs.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventArguments\\FirebirdMouseButtonEventArgs.cs", + "RelativeToolTip": "Firebird2D.EventPipelines\\EventArguments\\FirebirdMouseButtonEventArgs.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABMAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-20T12:45:04.054Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "Title": "FirebirdJoystickButtonEventArgs.cs", + "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventArguments\\FirebirdJoystickButtonEventArgs.cs", + "RelativeDocumentMoniker": "Firebird2D.EventPipelines\\EventArguments\\FirebirdJoystickButtonEventArgs.cs", + "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.EventPipelines\\EventArguments\\FirebirdJoystickButtonEventArgs.cs", + "RelativeToolTip": "Firebird2D.EventPipelines\\EventArguments\\FirebirdJoystickButtonEventArgs.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAABEAAAAFAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-04-20T12:48:47.531Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 18, "Title": "ClassDiagram.md", "DocumentMoniker": "G:\\Coding\\Firebird2D\\ClassDiagram.md", "RelativeDocumentMoniker": "ClassDiagram.md", @@ -187,31 +332,8 @@ "RelativeToolTip": "ClassDiagram.md", "ViewState": "AQIAAAAAAAAAAAAAAAAAACcAAAAFAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001818|", - "WhenOpened": "2025-04-17T17:57:06.258Z" - }, - { - "$type": "Document", - "DocumentIndex": 10, - "Title": "Require.cs", - "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Require.cs", - "RelativeDocumentMoniker": "Firebird2D.Requirement\\Require.cs", - "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Require.cs", - "RelativeToolTip": "Firebird2D.Requirement\\Require.cs", - "ViewState": "AQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-17T17:56:35.49Z" - }, - { - "$type": "Document", - "DocumentIndex": 11, - "Title": "GameLogger.cs", - "DocumentMoniker": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\GameLogger.cs", - "RelativeDocumentMoniker": "Firebird2D.Logger\\GameLogger.cs", - "ToolTip": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\GameLogger.cs", - "RelativeToolTip": "Firebird2D.Logger\\GameLogger.cs", - "ViewState": "AQIAAAMAAAAAAAAAAIBJwAAAAAAAAAAA", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-17T17:56:23.324Z" + "WhenOpened": "2025-04-17T17:57:06.258Z", + "EditorCaption": "" } ] } diff --git a/.vs/ProjectEvaluation/firebird2d.metadata.v8.bin b/.vs/ProjectEvaluation/firebird2d.metadata.v8.bin index d541659..25be1a2 100644 Binary files a/.vs/ProjectEvaluation/firebird2d.metadata.v8.bin and b/.vs/ProjectEvaluation/firebird2d.metadata.v8.bin differ diff --git a/.vs/ProjectEvaluation/firebird2d.projects.v8.bin b/.vs/ProjectEvaluation/firebird2d.projects.v8.bin index 21be967..a1d5214 100644 Binary files a/.vs/ProjectEvaluation/firebird2d.projects.v8.bin and b/.vs/ProjectEvaluation/firebird2d.projects.v8.bin differ diff --git a/.vs/ProjectEvaluation/firebird2d.strings.v8.bin b/.vs/ProjectEvaluation/firebird2d.strings.v8.bin index 3a4d4ec..b9682f6 100644 Binary files a/.vs/ProjectEvaluation/firebird2d.strings.v8.bin and b/.vs/ProjectEvaluation/firebird2d.strings.v8.bin differ diff --git a/FireBird2D.Interfaces/Firebird2D.Interfaces.csproj b/FireBird2D.Interfaces/Firebird2D.Interfaces.csproj new file mode 100644 index 0000000..fa71b7a --- /dev/null +++ b/FireBird2D.Interfaces/Firebird2D.Interfaces.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/FireBird2D.Interfaces/IGame.cs b/FireBird2D.Interfaces/IGame.cs new file mode 100644 index 0000000..63de045 --- /dev/null +++ b/FireBird2D.Interfaces/IGame.cs @@ -0,0 +1,13 @@ +using Firebird2D.Interfaces; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Firebird2D.Interfaces +{ + public interface IGame + { + } +} diff --git a/Firebird2D.Logger/Firebird2D.Logger.csproj b/Firebird2D.Logger/Firebird2D.Logger.csproj index fa71b7a..0e7576a 100644 --- a/Firebird2D.Logger/Firebird2D.Logger.csproj +++ b/Firebird2D.Logger/Firebird2D.Logger.csproj @@ -6,4 +6,8 @@ enable + + + + diff --git a/Firebird2D.Logger/GameLogger.cs b/Firebird2D.Logger/GameLogger.cs index 0608647..60f48cb 100644 --- a/Firebird2D.Logger/GameLogger.cs +++ b/Firebird2D.Logger/GameLogger.cs @@ -1,4 +1,5 @@ -using System; +using Firebird2D.Interfaces; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,51 +7,72 @@ using System.Threading.Tasks; namespace Firebird2D.Logger { - public enum LogType - { - Info, - Warning, - Error - } - public static class GameLogger + public class GameLogger : ILogger { - private static readonly string LogFilePath = "Logs/Log.txt"; + private string LogFilePath = "Logs/"; - public static bool logActive { get { return _logActive; } set { _logActive = value; if (value == false) Log("Logger", LogType.Info, "Log Deactivated"); } } + public bool LogActive { get { return _logActive; } set { _logActive = value; if (value == false) Log("Logger", LogType.Info, "Log Deactivated"); } } - private static bool _logActive = true; + private bool _logActive = true; - public static void Initalize() + private FileStream? fileStream; + + private readonly object _fileLock = new(); + + private static readonly List instances = []; + + public int InstanceNumber { get; private set; } + + private GameLogger(int instanceNumber, string instanceName) + { + LogFilePath += $"Log_{instanceName}.txt"; + InstanceNumber = instanceNumber; + Initalize(); + } + + public static ILogger GetNewInstance(string instanceName) + { + GameLogger instance = new(instances.Count, instanceName); + instances.Add(instance); + return instance; + } + + public static ILogger GetInstance(int instanceNumber) + { + return instances[instanceNumber]; + } + + private void Initalize() { if (!Directory.Exists("Logs")) { Directory.CreateDirectory("Logs"); - - using (FileStream fileStream = File.Open(LogFilePath, FileMode.OpenOrCreate | FileMode.Append)) - { - AddText(fileStream, "===================" + System.DateTime.Today.ToString("dd,MM,yy") + "==================="); - } } + fileStream = File.Open(LogFilePath, FileMode.OpenOrCreate | FileMode.Append, FileAccess.Write, FileShare.Read); + + lock (_fileLock) + { + AddText(fileStream, "===================" + DateTime.Now.ToString("dd.MM.yy HH:mm:ss") + "===================" + Environment.NewLine); + } } - public static void Log(string loggingInstance, LogType type, string message) + public void Log(string loggingInstance, LogType type, string message) { - if (_logActive) - { - using (FileStream fileStream = File.Open(LogFilePath, FileMode.OpenOrCreate | FileMode.Append)) + if (_logActive && fileStream != null) + { + lock (_fileLock) { - AddText(fileStream, type.ToString("g") + ": " + loggingInstance + " -> " + message); - fileStream.Close(); + AddText(fileStream, $"{DateTime.Now:HH:mm:ss} {type}: {loggingInstance} -> {message}{Environment.NewLine}"); } - } } + private static void AddText(FileStream fs, string value) { - byte[] info = new UTF8Encoding(true).GetBytes(value); - fs.Write(info, 0, info.Length); + using StreamWriter writer = new(fs, Encoding.UTF8, 1024, leaveOpen: true); + writer.Write(value); } } } diff --git a/Firebird2D.Logger/ILogger.cs b/Firebird2D.Logger/ILogger.cs new file mode 100644 index 0000000..8cc0135 --- /dev/null +++ b/Firebird2D.Logger/ILogger.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Firebird2D.Logger +{ + public enum LogType + { + Info, + Warning, + Error + } + + public interface ILogger + { + public bool LogActive { get; set; } + + public int InstanceNumber { get; } + + public abstract static ILogger GetNewInstance(string instanceName); + + public abstract static ILogger GetInstance(int instanceNumber); + + public void Log(string loggingInstance, LogType type, string message); + } +} diff --git a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfo.cs b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfo.cs index 1692793..cb3582b 100644 --- a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfo.cs +++ b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Firebird2D.Logger")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b4d5afc4ba4c2fb1fde6fb769da0e6c84003d734")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+51493135dfc8aa77e4285d80e32310c1f02be5b0")] [assembly: System.Reflection.AssemblyProductAttribute("Firebird2D.Logger")] [assembly: System.Reflection.AssemblyTitleAttribute("Firebird2D.Logger")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfoInputs.cache b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfoInputs.cache index b52536c..ac2441c 100644 --- a/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfoInputs.cache +++ b/Firebird2D.Logger/obj/Debug/net8.0/Firebird2D.Logger.AssemblyInfoInputs.cache @@ -1 +1 @@ -affe20a17e8e88d1b9a30dd26c0c5847166b5692d8b48ab665b103d74ddc8438 +112eff4245416fbc9f49d96f1eeefaf18aad8e2f51adfc91c39b7f223783ed14 diff --git a/Firebird2D.Logger/obj/Firebird2D.Logger.csproj.nuget.dgspec.json b/Firebird2D.Logger/obj/Firebird2D.Logger.csproj.nuget.dgspec.json index 1ce3d90..0b859c4 100644 --- a/Firebird2D.Logger/obj/Firebird2D.Logger.csproj.nuget.dgspec.json +++ b/Firebird2D.Logger/obj/Firebird2D.Logger.csproj.nuget.dgspec.json @@ -4,14 +4,14 @@ "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": {} }, "projects": { - "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", - "projectName": "Firebird2D.Logger", - "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectUniqueName": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj", + "projectName": "Firebird2D.Interfaces", + "projectPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj", "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", - "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\obj\\", + "outputPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -70,6 +70,77 @@ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.303/PortableRuntimeIdentifierGraph.json" } } + }, + "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "projectName": "Firebird2D.Logger", + "projectPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", + "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", + "outputPath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], + "configFilePaths": [ + "C:\\Users\\wayan\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\Infrastructure\\Packages": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\References": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "projectReferences": { + "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.303/PortableRuntimeIdentifierGraph.json" + } + } } } } \ No newline at end of file diff --git a/Firebird2D.Logger/obj/project.assets.json b/Firebird2D.Logger/obj/project.assets.json index 0d852b0..a42ba01 100644 --- a/Firebird2D.Logger/obj/project.assets.json +++ b/Firebird2D.Logger/obj/project.assets.json @@ -1,11 +1,30 @@ { "version": 3, "targets": { - "net8.0": {} + "net8.0": { + "Firebird2D.Interfaces/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "compile": { + "bin/placeholder/Firebird2D.Interfaces.dll": {} + }, + "runtime": { + "bin/placeholder/Firebird2D.Interfaces.dll": {} + } + } + } + }, + "libraries": { + "Firebird2D.Interfaces/1.0.0": { + "type": "project", + "path": "../FireBird2D.Interfaces/Firebird2D.Interfaces.csproj", + "msbuildProject": "../FireBird2D.Interfaces/Firebird2D.Interfaces.csproj" + } }, - "libraries": {}, "projectFileDependencyGroups": { - "net8.0": [] + "net8.0": [ + "Firebird2D.Interfaces >= 1.0.0" + ] }, "packageFolders": { "C:\\Users\\wayan\\.nuget\\packages\\": {}, @@ -41,7 +60,11 @@ "frameworks": { "net8.0": { "targetAlias": "net8.0", - "projectReferences": {} + "projectReferences": { + "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj" + } + } } }, "warningProperties": { diff --git a/Firebird2D.Logger/obj/project.nuget.cache b/Firebird2D.Logger/obj/project.nuget.cache index c784785..3d6821f 100644 --- a/Firebird2D.Logger/obj/project.nuget.cache +++ b/Firebird2D.Logger/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "tcqAw3429hg=", + "dgSpecHash": "DP1d2KMGQuQ=", "success": true, "projectFilePath": "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj", "expectedPackageFiles": [], diff --git a/Firebird2D.Requirement/Require.cs b/Firebird2D.Requirement/Require.cs index b68288d..a541080 100644 --- a/Firebird2D.Requirement/Require.cs +++ b/Firebird2D.Requirement/Require.cs @@ -1,16 +1,64 @@ -using Firebird2D.Logger; + +using Firebird2D.Logger; using System.Runtime.CompilerServices; namespace Firebird2D.Requirement { public class Require { - public static void NotNull(object input, string name, [CallerMemberName] string callerName = "", [CallerFilePath] string callerPath = "", [CallerLineNumber] int callerLineNumber = 0) + public static void NotNull(object input, string name, int loggerInstanceNumber, + [CallerMemberName] string callerName = "", + [CallerFilePath] string callerPath = "", + [CallerLineNumber] int callerLineNumber = 0) { - if (input == null) { - GameLogger.Log(callerName, LogType.Error, string.Format("{0}, was Null at Line {1} in {2} from {3}.", name, callerLineNumber, callerName, callerPath)); - throw new ArgumentNullException(string.Format("{0}, was Null at Line {1} in {2} from {3}.", name, callerLineNumber, callerName, callerPath)); + if (input == null) + { + LogAndThrow(loggerInstanceNumber, callerName, callerPath, callerLineNumber, + $"{name} was null."); } } + + public static void NotEmpty(string input, string name, int loggerInstanceNumber, + [CallerMemberName] string callerName = "", + [CallerFilePath] string callerPath = "", + [CallerLineNumber] int callerLineNumber = 0) + { + if (string.IsNullOrEmpty(input)) + { + LogAndThrow(loggerInstanceNumber, callerName, callerPath, callerLineNumber, + $"{name} must not be null or empty."); + } + } + + public static void Range(int value, int min, int max, string name, int loggerInstanceNumber, + [CallerMemberName] string callerName = "", + [CallerFilePath] string callerPath = "", + [CallerLineNumber] int callerLineNumber = 0) + { + if (value < min || value > max) + { + LogAndThrow(loggerInstanceNumber, callerName, callerPath, callerLineNumber, + $"{name} must be in range [{min}, {max}], but was {value}."); + } + } + + public static void IsTrue(bool condition, string message, int loggerInstanceNumber, + [CallerMemberName] string callerName = "", + [CallerFilePath] string callerPath = "", + [CallerLineNumber] int callerLineNumber = 0) + { + if (!condition) + { + LogAndThrow(loggerInstanceNumber, callerName, callerPath, callerLineNumber, message); + } + } + + private static void LogAndThrow(int loggerInstanceNumber, string callerName, string callerPath, int lineNumber, string message) + { + string fullMessage = $"{message} (at {callerName} in {callerPath}, line {lineNumber})"; + + GameLogger.GetInstance(loggerInstanceNumber).Log(callerName, LogType.Error, fullMessage); + throw new ArgumentException(fullMessage); + } } } diff --git a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfo.cs b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfo.cs index ff3bece..bd35599 100644 --- a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfo.cs +++ b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Firebird2D.Requirement")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b4d5afc4ba4c2fb1fde6fb769da0e6c84003d734")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+51493135dfc8aa77e4285d80e32310c1f02be5b0")] [assembly: System.Reflection.AssemblyProductAttribute("Firebird2D.Requirement")] [assembly: System.Reflection.AssemblyTitleAttribute("Firebird2D.Requirement")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfoInputs.cache b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfoInputs.cache index 8545fac..d9504b1 100644 --- a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfoInputs.cache +++ b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.AssemblyInfoInputs.cache @@ -1 +1 @@ -e39a5a8fa70529a2443df64310c68b2a15058d3b8161dad3c45da459c8bf1c38 +40d7aae7c923ca3d4454d246c52e8a64820bf9653fadbe515530b8637584741e diff --git a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.assets.cache b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.assets.cache index 85afab9..3b15747 100644 Binary files a/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.assets.cache and b/Firebird2D.Requirement/obj/Debug/net8.0/Firebird2D.Requirement.assets.cache differ diff --git a/Firebird2D.Requirement/obj/Firebird2D.Requirement.csproj.nuget.dgspec.json b/Firebird2D.Requirement/obj/Firebird2D.Requirement.csproj.nuget.dgspec.json index ecf7b85..a0e3149 100644 --- a/Firebird2D.Requirement/obj/Firebird2D.Requirement.csproj.nuget.dgspec.json +++ b/Firebird2D.Requirement/obj/Firebird2D.Requirement.csproj.nuget.dgspec.json @@ -4,6 +4,73 @@ "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj": {} }, "projects": { + "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj", + "projectName": "Firebird2D.Interfaces", + "projectPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj", + "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", + "outputPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], + "configFilePaths": [ + "C:\\Users\\wayan\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\Infrastructure\\Packages": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\References": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.303/PortableRuntimeIdentifierGraph.json" + } + } + }, "G:\\Coding\\Firebird2D\\Firebird2D.Logger\\Firebird2D.Logger.csproj": { "version": "1.0.0", "restore": { @@ -34,7 +101,11 @@ "frameworks": { "net8.0": { "targetAlias": "net8.0", - "projectReferences": {} + "projectReferences": { + "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj" + } + } } }, "warningProperties": { diff --git a/Firebird2D.Requirement/obj/project.assets.json b/Firebird2D.Requirement/obj/project.assets.json index 59992ea..66e28ea 100644 --- a/Firebird2D.Requirement/obj/project.assets.json +++ b/Firebird2D.Requirement/obj/project.assets.json @@ -2,9 +2,22 @@ "version": 3, "targets": { "net8.0": { + "Firebird2D.Interfaces/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "compile": { + "bin/placeholder/Firebird2D.Interfaces.dll": {} + }, + "runtime": { + "bin/placeholder/Firebird2D.Interfaces.dll": {} + } + }, "Firebird2D.Logger/1.0.0": { "type": "project", "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "Firebird2D.Interfaces": "1.0.0" + }, "compile": { "bin/placeholder/Firebird2D.Logger.dll": {} }, @@ -15,6 +28,11 @@ } }, "libraries": { + "Firebird2D.Interfaces/1.0.0": { + "type": "project", + "path": "../FireBird2D.Interfaces/Firebird2D.Interfaces.csproj", + "msbuildProject": "../FireBird2D.Interfaces/Firebird2D.Interfaces.csproj" + }, "Firebird2D.Logger/1.0.0": { "type": "project", "path": "../Firebird2D.Logger/Firebird2D.Logger.csproj", diff --git a/Firebird2D.Requirement/obj/project.nuget.cache b/Firebird2D.Requirement/obj/project.nuget.cache index 9693734..7b6690a 100644 --- a/Firebird2D.Requirement/obj/project.nuget.cache +++ b/Firebird2D.Requirement/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "Cnwm1cp4iIM=", + "dgSpecHash": "UvsIOKD4Be8=", "success": true, "projectFilePath": "G:\\Coding\\Firebird2D\\Firebird2D.Requirement\\Firebird2D.Requirement.csproj", "expectedPackageFiles": [], diff --git a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfo.cs b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfo.cs index 5bce199..f15009f 100644 --- a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfo.cs +++ b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Firebird2D.SFMLExtensions")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b4d5afc4ba4c2fb1fde6fb769da0e6c84003d734")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+51493135dfc8aa77e4285d80e32310c1f02be5b0")] [assembly: System.Reflection.AssemblyProductAttribute("Firebird2D.SFMLExtensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Firebird2D.SFMLExtensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfoInputs.cache b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfoInputs.cache index ccb5cd9..b33eb8a 100644 --- a/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfoInputs.cache +++ b/Firebird2D.SFMLExtensions/obj/Debug/net8.0/Firebird2D.SFMLExtensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -cc9869897aeaa6a5dfabc87ead78ab52b0a4f6484df7ba1391f0a03cd3a7749c +fa9b95393a1d4670d93070836ffe1fceddd4879784341915bf008e4e9f86cbb7 diff --git a/Firebird2D.sln b/Firebird2D.sln index e119f4f..801de71 100644 --- a/Firebird2D.sln +++ b/Firebird2D.sln @@ -18,7 +18,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentat EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Firebird2D.EventPipelines", "Firebird2D.EventPipelines\Firebird2D.EventPipelines.csproj", "{FB2B6835-02BF-4AE7-B85F-290472787ED3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebird2D.KeyMapping", "Firebird2D.KeyMapper\Firebird2D.KeyMapping.csproj", "{38CCA723-C113-4E44-B074-F9B709B0EEB4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Firebird2D.KeyMapping", "Firebird2D.KeyMapper\Firebird2D.KeyMapping.csproj", "{38CCA723-C113-4E44-B074-F9B709B0EEB4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Firebird2D.Interfaces", "FireBird2D.Interfaces\Firebird2D.Interfaces.csproj", "{7F6F9690-3BD3-4D44-BE62-3A7282DA671D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -50,6 +52,10 @@ Global {38CCA723-C113-4E44-B074-F9B709B0EEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU {38CCA723-C113-4E44-B074-F9B709B0EEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {38CCA723-C113-4E44-B074-F9B709B0EEB4}.Release|Any CPU.Build.0 = Release|Any CPU + {7F6F9690-3BD3-4D44-BE62-3A7282DA671D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7F6F9690-3BD3-4D44-BE62-3A7282DA671D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7F6F9690-3BD3-4D44-BE62-3A7282DA671D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7F6F9690-3BD3-4D44-BE62-3A7282DA671D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Firebird2D/Configuration/GameConfig.cs b/Firebird2D/Configuration/GameConfig.cs index 4f5e758..7267be8 100644 --- a/Firebird2D/Configuration/GameConfig.cs +++ b/Firebird2D/Configuration/GameConfig.cs @@ -14,7 +14,7 @@ namespace Firebird2D.Configuration public bool FullScreen { get { return _fullScreen; } set { _fullScreen = value; updateConfig(); } } - public bool LogActive { get { return _logActive; } set { _logActive = value; GameLogger.logActive = value; updateConfig(); } } + public bool LogActive { get { return _logActive; } set { _logActive = value; GameLogger.LogActive = value; updateConfig(); } } private static readonly string ConfigSchema = "Configuration/ConfigurationSchema/ConfigSchema.json"; @@ -61,7 +61,7 @@ namespace Firebird2D.Configuration _videoMode.Height = uint.Parse(_configurationSection["ScreenResolution:y"]); _fullScreen = bool.Parse(_configurationSection["Fullscreen"]); _logActive = bool.Parse(_configurationSection["Log"]); - GameLogger.logActive = _logActive; + GameLogger.LogActive = _logActive; } catch(Exception ex) { diff --git a/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfo.cs b/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfo.cs index 92d98be..a33ff92 100644 --- a/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfo.cs +++ b/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("Firebird2D")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+b4d5afc4ba4c2fb1fde6fb769da0e6c84003d734")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+51493135dfc8aa77e4285d80e32310c1f02be5b0")] [assembly: System.Reflection.AssemblyProductAttribute("Firebird2D")] [assembly: System.Reflection.AssemblyTitleAttribute("Firebird2D")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfoInputs.cache b/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfoInputs.cache index ec709c2..2565287 100644 --- a/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfoInputs.cache +++ b/Firebird2D/obj/Debug/net8.0/Firebird2D.AssemblyInfoInputs.cache @@ -1 +1 @@ -c0a24d86bf21784cd90312be0fc44d53210fd1ff433ae25e4a8ab483ba3e79a7 +9d9bedf3152c73b5d358c9740a2af87d4522a5c313195cccdcb155cc37e3b9c4 diff --git a/Firebird2D/obj/Debug/net8.0/Firebird2D.assets.cache b/Firebird2D/obj/Debug/net8.0/Firebird2D.assets.cache index 6571147..e8747d3 100644 Binary files a/Firebird2D/obj/Debug/net8.0/Firebird2D.assets.cache and b/Firebird2D/obj/Debug/net8.0/Firebird2D.assets.cache differ diff --git a/Firebird2D/obj/Firebird2D.csproj.nuget.dgspec.json b/Firebird2D/obj/Firebird2D.csproj.nuget.dgspec.json index f7d2634..897d85e 100644 --- a/Firebird2D/obj/Firebird2D.csproj.nuget.dgspec.json +++ b/Firebird2D/obj/Firebird2D.csproj.nuget.dgspec.json @@ -77,6 +77,73 @@ } } }, + "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj": { + "version": "1.0.0", + "restore": { + "projectUniqueName": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj", + "projectName": "Firebird2D.Interfaces", + "projectPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj", + "packagesPath": "C:\\Users\\wayan\\.nuget\\packages\\", + "outputPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\obj\\", + "projectStyle": "PackageReference", + "fallbackFolders": [ + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + ], + "configFilePaths": [ + "C:\\Users\\wayan\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", + "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, + "C:\\Program Files\\dotnet\\library-packs": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\Infrastructure\\Packages": {}, + "C:\\TwinCAT\\Functions\\TE2000-HMI-Engineering\\References": {}, + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + } + }, + "frameworks": { + "net8.0": { + "targetAlias": "net8.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.303/PortableRuntimeIdentifierGraph.json" + } + } + }, "G:\\Coding\\Firebird2D\\Firebird2D.KeyMapper\\Firebird2D.KeyMapping.csproj": { "version": "1.0.0", "restore": { @@ -178,7 +245,11 @@ "frameworks": { "net8.0": { "targetAlias": "net8.0", - "projectReferences": {} + "projectReferences": { + "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj": { + "projectPath": "G:\\Coding\\Firebird2D\\FireBird2D.Interfaces\\Firebird2D.Interfaces.csproj" + } + } } }, "warningProperties": { diff --git a/Firebird2D/obj/project.assets.json b/Firebird2D/obj/project.assets.json index bbf0d54..349054a 100644 --- a/Firebird2D/obj/project.assets.json +++ b/Firebird2D/obj/project.assets.json @@ -1056,6 +1056,16 @@ "bin/placeholder/Firebird2D.EventPipelines.dll": {} } }, + "Firebird2D.Interfaces/1.0.0": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "compile": { + "bin/placeholder/Firebird2D.Interfaces.dll": {} + }, + "runtime": { + "bin/placeholder/Firebird2D.Interfaces.dll": {} + } + }, "Firebird2D.KeyMapping/1.0.0": { "type": "project", "framework": ".NETCoreApp,Version=v8.0", @@ -1072,6 +1082,9 @@ "Firebird2D.Logger/1.0.0": { "type": "project", "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "Firebird2D.Interfaces": "1.0.0" + }, "compile": { "bin/placeholder/Firebird2D.Logger.dll": {} }, @@ -1790,6 +1803,11 @@ "path": "../Firebird2D.EventPipelines/Firebird2D.EventPipelines.csproj", "msbuildProject": "../Firebird2D.EventPipelines/Firebird2D.EventPipelines.csproj" }, + "Firebird2D.Interfaces/1.0.0": { + "type": "project", + "path": "../FireBird2D.Interfaces/Firebird2D.Interfaces.csproj", + "msbuildProject": "../FireBird2D.Interfaces/Firebird2D.Interfaces.csproj" + }, "Firebird2D.KeyMapping/1.0.0": { "type": "project", "path": "../Firebird2D.KeyMapper/Firebird2D.KeyMapping.csproj", diff --git a/Firebird2D/obj/project.nuget.cache b/Firebird2D/obj/project.nuget.cache index 0314e33..9d24d44 100644 --- a/Firebird2D/obj/project.nuget.cache +++ b/Firebird2D/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "TRKtJseqRqc=", + "dgSpecHash": "62iPCpiCzS8=", "success": true, "projectFilePath": "G:\\Coding\\Firebird2D\\Firebird2D\\Firebird2D.csproj", "expectedPackageFiles": [