Merge pull request #2 from jeremj22/feature/upstream

Feature/upstream

.gitattributes

@@ -1,63 +1,48 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
-* text=auto
+################################################################################
+### Default behavior
+###     - Treat as text
+###     - Normalize to Unix-style line endings
+################################################################################
+*                   text        eol=lf
 
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
+################################################################################
+### C# source file behavior
+###     - Treat as text
+###     - Normalize to Unix-style line endings
+###     - Diff as csharp
+################################################################################
+*.cs                text        eol=lf          diff=csharp
 
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
+################################################################################
+### csproj file behavior
+###     - Treat as text
+###     - Normalize to Unix-style line endings
+###     - Use a union merge when resolving conflicts
+################################################################################
+.csproj             text        eol=lf          merge=union
 
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
+################################################################################
+### sln file behavior
+###     - Treat as text
+###     - Normalize to Windows-style line endings
+###     - Use a union merge when resolving conflicts
+################################################################################
+*.sln               text        eol=crlf        merge=union
 
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain
+################################################################################
+### image file behavior
+###     - Treat as binary
+################################################################################
+*.bmp               binary
+*.gif               binary
+*.ico               binary
+*.jpg               binary
+*.jpeg              binary
+*.png               binary
+*.webp              binary
+
+################################################################################
+### MGFXO file behavior
+###     - Treat as binary
+################################################################################
+*.mgfxo             binary

.github/FUNDING.yml

@@ -1,2 +1,3 @@
-github: craftworkgames
-patreon: craftworkgames
+github:
+  - aristurtledev
+  - craftworkgames

.github/workflows/create-release.yml

@@ -0,0 +1,80 @@
+################################################################################
+### Build MonoGame.Extended (Develop)
+### Clones the `develop` branch and performs a build, test, then pack of the
+### Monogame.Extended source code.  Once the build job is finished, the deploy
+### job will upload the nupkg files created to the MonoGame.Extended GitHub
+###
+###     - Only runs on a push to the `develop` branch
+################################################################################
+name: "Create Release"
+
+on:
+  workflow_dispatch:
+    inputs:
+      prerelease:
+        description: 'Is this a prerelease?'
+        required: true
+        default: 'true'
+      source-feed:
+        description: |
+          Which source feed to publish to?
+          (Valid values are 'NuGet' or 'GitHub')
+        required: true
+        default: GitHub
+
+jobs:
+  build:
+    name: "Build MonoGame.Extended"
+    runs-on: ubuntu-latest
+    env:
+      IS_PRERELEASE:  ${{ inputs.prerelease == 'true' }}
+      BUILD_NUMBER: ${{ inputs.prerelease == 'true' && github.run_number || '' }}
+
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@v4
+
+      - name: Setup Dotnet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Build MonoGame.Extended
+        run: dotnet build --nologo --verbosity minimal --configuration Release
+
+      - name: Test MonoGame.Extended
+        run: dotnet test --nologo --verbosity minimal --configuration Release
+
+      - name: Pack MonoGame.Extended
+        run: dotnet pack --nologo --verbosity minimal --configuration Release
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-artifacts
+          path: ./.artifacts/source/package/release/*.nupkg
+
+  deploy:
+    name: "Deploy NuGets"
+    runs-on: ubuntu-latest
+    needs: [ build ]
+    permissions:
+      packages: write
+      contents: write
+
+    steps:
+      - name: "Download Artifacts"
+        uses: actions/download-artifact@v4
+        with:
+          name: build-artifacts
+          path: ./.artifacts
+
+      - name: "Push Packages"
+        env:
+          SOURCE_URL: ${{ inputs.source-feed == 'GitHub' && 'https://nuget.pkg.github.com/craftworkgames/index.json' || inputs.source-feed == 'NuGet' && 'https://api.nuget.org/v3/index.json' }}
+          API_KEY: ${{ inputs.source-feed == 'GitHub' && secrets.GITHUB_TOKEN || inputs.source-feed == 'NuGet' && secrets.NUGET_ACCESS_TOKEN }}
+        run: |
+          PACKAGES=(".artifacts/*.nupkg")
+          for PACKAGE in "${PACKAGES[@]}"; do
+            dotnet nuget push "$PACKAGE" --source "$SOURCE_URL" --skip-duplicate --api-key "$API_KEY"
+          done

.github/workflows/pull-request-test.yml

@@ -0,0 +1,32 @@
+################################################################################
+### Pull Request Test
+### Executes tests to ensure that the pull request being submitted is valid.
+###     - Only runs on pull requests made to the `develop` branch
+###     - Only runs if the pull request was opened or synchronized
+################################################################################
+name: Pull Request Test
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - main
+    types:
+      - opened
+      - synchronize
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone Repository
+        uses: actions/checkout@v4
+
+      - name: Setup DotNet
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Test MonoGame.Extended
+        run: dotnet test --nologo --verbosity minimal --configuration Release

.gitignore

@@ -1,14 +1,29 @@
-# Build artifacts
+################################################################################
+### IDE directories
+################################################################################
+.vs/
+.vscode/
+.idea/
+
+################################################################################
+### User specific files that can be generated by Visual Studio
+################################################################################
+*.suo
+*.user
+
+################################################################################
+### Build and Intermediate directories
+################################################################################
 [Bb]in/
 [Oo]bj/
 
-# Rider
-.idea/
-*.user
+################################################################################
+### Build artifacts directory
+################################################################################
+*.[Aa]rtifacts/
 
-# macOS
+################################################################################
+### OS specific auto generated files
+################################################################################
 .DS_Store
-*.user
-
-# cake build output
-artifacts
+[Tt]humbs.db

CONTRIBUTING.md

@@ -9,7 +9,7 @@ Please read this document completely before contributing.
 
 ## How To Contribute
 
-MonoGame.Extended has a `master` branch for stable releases and a `develop` branch for daily development.  New features and fixes are always submitted to the `develop` branch.
+MonoGame.Extended has a `main` branch for stable releases and a `develop` branch for daily development.  New features and fixes are always submitted to the `develop` branch.
 
 If you are looking for ways to help you should start by looking at the [Open Issues](https://github.com/craftworkgames/MonoGame.Extended/issues).  Please let us know if you plan to work on an issue so that others are not duplicating work.
 
@@ -43,9 +43,9 @@ We prohibit tools like dotPeek, ILSpy, JustDecompiler, or .NET Reflector which c
 It is **NEVER ACCEPTABLE** to decompile copyrighted assemblies and submit that code to the MonoGame.Extended project.
 
 * It **DOES NOT** matter how much you change the code.
-* It **DOES NOT** matter what country you live in or what your local laws say.  
-* It **DOES NOT** matter that XNA is discontinued.  
-* It **DOES NOT** matter how small the bit of code you have stolen is.  
+* It **DOES NOT** matter what country you live in or what your local laws say.
+* It **DOES NOT** matter that XNA is discontinued.
+* It **DOES NOT** matter how small the bit of code you have stolen is.
 * It **DOES NOT** matter what your opinion is of stealing code.
 
 If you did not write the code, you do not have ownership of the code, and you shouldn't submit it to MonoGame.Extended.
@@ -62,7 +62,7 @@ We accept contributions in "good faith" that it isn't bound to a conflicting lic
 
 ## Need More Help?
 
-If you need help please ask questions on our [community forums](http://community.monogame.net/c/extended) or come [chat on Discord](https://discord.gg/xPUEkj9).
+If you need help, please ask questions in our [Discord](https://discord.gg/xPUEkj9), or you can ask questions in the official [MonoGame Discord](https://discord.gg/monogame).
 
 
 Thanks for reading this guide and helping make MonoGame.Extended great!

LICENSE

@@ -1,8 +1,9 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2020:
+Copyright (c) 2015-2024:
 - Dylan Wilson (https://github.com/dylanwilson80)
 - Lucas Girouard-Stranks (https://github.com/lithiumtoast)
+- Christopher Whitley (https://github.com/aristurtledev)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal