Merge branch 'release' into main

# Conflicts: # CHANGELOG.md
2024-11-22 12:58:33 +01:00 · 2021-07-01 05:06:39 +02:00 · 2021-07-01 05:06:39 +02:00 · 00d9ee99d8
commit 00d9ee99d8
parent 579fd38533 19893855dc
10 changed files with 71 additions and 74 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,8 +1,6 @@
 # Changelog
 MLEM uses [semantic versioning](https://semver.org/).

-This changelog also contains information on versions that have yet to be released. The changelog for unreleased versions might be edited over time as new features get added, changed or removed. You can get prerelease builds of unreleased versions on [BaGet](https://nuget.ellpeck.de). To see the newest released version's code, check out the [release branch](https://github.com/Ellpeck/MLEM/tree/release).
-
 Jump to version:
 - [5.1.0 (Unreleased)](#510-unreleased)
 - [5.0.0](#500)
--- a/Docs/docfx.json
+++ b/Docs/docfx.json
@ -1,64 +1,61 @@
 {
-  "metadata": [{
-    "src": [{
-      "src": "../",
-      "files": [
-        "**.csproj"
-      ]
-    }],
-    "dest": "api",
-    "filter": "filter.yml"
-  }],
-  "build": {
-    "content": [{
-        "files": [
-          "api/**.yml"
-        ]
-      },
-      {
-        "files": [
-          "articles/**.md",
-          "articles/**/toc.yml",
-          "toc.yml",
-          "*.md"
-        ]
-      }
+    "metadata": [
+        {
+            "src": [
+                {
+                    "src": "../",
+                    "files": [
+                        "**.csproj"
+                    ]
+                }
+            ],
+            "dest": "api",
+            "filter": "filter.yml"
+        }
    ],
-    "resource": [{
-      "files": [
-        "favicon.ico"
-      ]
-    }, {
-      "files": [
-        "Logo.svg",
-        "Formatting.png",
-        "Ui.gif"
-      ],
-      "src": "../Media"
-    }],
-    "globalMetadata": {
-      "_appTitle": "MLEM Documentation",
-      "_appLogoPath": "Logo.svg",
-      "_appFooter": "<a href=\"https://github.com/Ellpeck/MLEM\">&copy; 2019-2020 Ellpeck</a> &ndash; <a href=\"https://ellpeck.de/#impressum\">Impressum</a> &ndash; <a href=\"https://ellpeck.de/#privacy\">Privacy</a>"
-    },
-    "overwrite": [{
-      "files": [
-        "apidoc/**.md"
-      ],
-      "exclude": [
-        "obj/**",
-        "_site/**"
-      ]
-    }],
-    "dest": "_site",
-    "globalMetadataFiles": [],
-    "fileMetadataFiles": [],
-    "template": [
-      "default",
-      "template"
-    ],
-    "postProcessors": [],
-    "markdownEngineName": "markdig",
-    "noLangKeyword": false
-  }
+    "build": {
+        "content": [
+            {
+                "files": [
+                    "articles/**.md",
+                    "articles/**/toc.yml",
+                    "toc.yml",
+                    "*.md",
+                    "api/**.yml"
+                ]
+            },
+            {
+                "files": [
+                    "CHANGELOG.md"
+                ],
+                "src": ".."
+            }
+        ],
+        "resource": [
+            {
+                "files": [
+                    "favicon.ico"
+                ]
+            },
+            {
+                "files": ["*"],
+                "src": "../Media"
+            }
+        ],
+        "globalMetadata": {
+            "_appTitle": "MLEM Documentation",
+            "_appLogoPath": "Logo.svg",
+            "_appFooter": "<a href=\"https://github.com/Ellpeck/MLEM\">&copy; 2019-2020 Ellpeck</a> &ndash; <a href=\"https://ellpeck.de/#impressum\">Impressum</a> &ndash; <a href=\"https://ellpeck.de/#privacy\">Privacy</a>"
+        },
+        "dest": "_site",
+        "globalMetadataFiles": [],
+        "fileMetadataFiles": [],
+        "template": [
+            "default",
+            "template"
+        ],
+        "postProcessors": [],
+        "markdownEngineName": "markdig",
+        "noLangKeyword": false
+    }
 }
--- a/Docs/index.md
+++ b/Docs/index.md
@ -1,4 +1,4 @@
-<img src="Logo.svg" width="25%" >
+<img src="../Media/Logo.svg" width="25%" >

 **MLEM Library for Extending MonoGame** is an addition to the game framework [MonoGame](https://www.monogame.net/) that provides extension methods, quality of life improvements and additional features like a ui system and easy input handling.

@ -8,7 +8,7 @@
 - See the source code on [GitHub](https://github.com/Ellpeck/MLEM)
 - See tutorials and API documentation on this website
 - Check out [the demos](https://github.com/Ellpeck/MLEM/tree/main/Demos) on [Desktop](https://github.com/Ellpeck/MLEM/tree/main/Demos.DesktopGL) or [Android](https://github.com/Ellpeck/MLEM/tree/main/Demos.Android)
- See [the changelog](https://github.com/Ellpeck/MLEM/blob/main/CHANGELOG.md) for information on updates
+- See [the changelog](../CHANGELOG.md) for information on updates

 # Made with MLEM
 - [A Breath of Spring Air](https://ellpeck.itch.io/a-breath-of-spring-air), a short platformer ([Source](https://git.ellpeck.de/Ellpeck/GreatSpringGameJam))
@ -21,10 +21,10 @@ If you created a game with the help of MLEM, you can get it added to this list b
 Here are some images that show a couple of MLEM's features.

 MLEM.Ui in action:  
-<img src="Ui.gif">
+<img src="../Media/Ui.gif">

 MLEM's text formatting system:  
-<img src="Formatting.png">
+<img src="../Media/Formatting.png">

 # Friends of MLEM
 There are several other NuGet packages and tools that work well in combination with MonoGame and MLEM. Here are some of them:
--- a/Docs/toc.yml
+++ b/Docs/toc.yml
@ -1,4 +1,6 @@
 - name: Tutorials
  href: articles/
 - name: API Documentation
-  href: api/
+  href: api/
+- name: Changelog
+  href: ../CHANGELOG.md
--- a/MLEM.Data/MLEM.Data.csproj
+++ b/MLEM.Data/MLEM.Data.csproj
@ -7,7 +7,7 @@
    <PropertyGroup>
        <Authors>Ellpeck</Authors>
        <Description>Simple data and network handling for MLEM Library for Extending MonoGame</Description>
-        <PackageReleaseNotes>See the full changelog at https://github.com/Ellpeck/MLEM/blob/main/CHANGELOG.md</PackageReleaseNotes>
+        <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
        <PackageTags>monogame ellpeck mlem utility extensions data network serialize</PackageTags>
        <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>
        <RepositoryUrl>https://github.com/Ellpeck/MLEM</RepositoryUrl>
--- a/MLEM.Extended/MLEM.Extended.csproj
+++ b/MLEM.Extended/MLEM.Extended.csproj
@ -7,7 +7,7 @@
    <PropertyGroup>
        <Authors>Ellpeck</Authors>
        <Description>MLEM Library for Extending MonoGame extension that ties in with MonoGame.Extended and other MonoGame libraries</Description>
-        <PackageReleaseNotes>See the full changelog at https://github.com/Ellpeck/MLEM/blob/main/CHANGELOG.md</PackageReleaseNotes>
+        <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
        <PackageTags>monogame ellpeck mlem utility extensions monogame.extended extended</PackageTags>
        <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>
        <RepositoryUrl>https://github.com/Ellpeck/MLEM</RepositoryUrl>
--- a/MLEM.Startup/MLEM.Startup.csproj
+++ b/MLEM.Startup/MLEM.Startup.csproj
@ -8,7 +8,7 @@
    <PropertyGroup>
        <Authors>Ellpeck</Authors>
        <Description>MLEM Library for Extending MonoGame combined with some other useful libraries into a quick Game startup class</Description>
-        <PackageReleaseNotes>See the full changelog at https://github.com/Ellpeck/MLEM/blob/main/CHANGELOG.md</PackageReleaseNotes>
+        <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
        <PackageTags>monogame ellpeck mlem utility extensions</PackageTags>
        <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>
        <RepositoryUrl>https://github.com/Ellpeck/MLEM</RepositoryUrl>
--- a/MLEM.Templates/MLEM.Templates.csproj
+++ b/MLEM.Templates/MLEM.Templates.csproj
@ -14,7 +14,7 @@
        <Title>MLEM Templates</Title>
        <Authors>Ellpeck</Authors>
        <Description>MLEM Library for Extending MonoGame cross-platform project templates</Description>
-        <PackageReleaseNotes>See the full changelog at https://github.com/Ellpeck/MLEM/blob/main/CHANGELOG.md</PackageReleaseNotes>
+        <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
        <PackageTags>dotnet-new templates monogame ellpeck mlem utility extensions</PackageTags>
        <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>
        <RepositoryUrl>https://github.com/Ellpeck/MLEM</RepositoryUrl>
--- a/MLEM.Ui/MLEM.Ui.csproj
+++ b/MLEM.Ui/MLEM.Ui.csproj
@ -7,7 +7,7 @@
    <PropertyGroup>
        <Authors>Ellpeck</Authors>
        <Description>A mouse, keyboard, gamepad and touch ready Ui system that features automatic anchoring, sizing and several ready-to-use element types.</Description>
-        <PackageReleaseNotes>See the full changelog at https://github.com/Ellpeck/MLEM/blob/main/CHANGELOG.md</PackageReleaseNotes>
+        <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
        <PackageTags>monogame ellpeck mlem ui user interface graphical gui system mouse keyboard gamepad touch</PackageTags>
        <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>
        <RepositoryUrl>https://github.com/Ellpeck/MLEM</RepositoryUrl>
--- a/MLEM/MLEM.csproj
+++ b/MLEM/MLEM.csproj
@ -7,7 +7,7 @@
    <PropertyGroup>
        <Authors>Ellpeck</Authors>
        <Description>MLEM Library for Extending MonoGame provides extension methods and additional features for MonoGame</Description>
-        <PackageReleaseNotes>See the full changelog at https://github.com/Ellpeck/MLEM/blob/main/CHANGELOG.md</PackageReleaseNotes>
+        <PackageReleaseNotes>See the full changelog at https://mlem.ellpeck.de/CHANGELOG</PackageReleaseNotes>
        <PackageTags>monogame ellpeck mlem utility extensions</PackageTags>
        <PackageProjectUrl>https://mlem.ellpeck.de/</PackageProjectUrl>
        <RepositoryUrl>https://github.com/Ellpeck/MLEM</RepositoryUrl>