mirror of
https://github.com/AlexMacocian/MonoGame.Extended.git
synced 2026-07-15 15:09:29 +00:00
Hotfix/monogame 384 compat (#1010)
* Hotfix: Update MonoGame reference to 3.8.4 * Bump patch version to 4.1.1 * update workflow to choose version tag * Bump to version 4.1.2 * Resolve issues with KNI tests
This commit is contained in:
committed by
GitHub
parent
dca32eeb39
commit
acc65421f3
@@ -229,7 +229,12 @@ public sealed class ParticleEffectReader : IDisposable
|
||||
{
|
||||
try
|
||||
{
|
||||
#if KNI
|
||||
using FileStream stream = File.OpenRead(filePath);
|
||||
Texture2D texture = Texture2D.FromStream(graphicsDeviceService.GraphicsDevice, stream);
|
||||
#else
|
||||
Texture2D texture = Texture2D.FromFile(graphicsDeviceService.GraphicsDevice, filePath);
|
||||
#endif
|
||||
texture.Name = name;
|
||||
return new Texture2DRegion(texture, bounds);
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||
<IsPackable>false</IsPackable>
|
||||
<NoWarn>CA1707</NoWarn>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="!$(DefineConstants.Contains('FNA')) AND !$(DefineConstants.Contains('KNI'))">
|
||||
|
||||
+14
-3
@@ -16,8 +16,19 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Update="TestData\astrid-animator-atlas.json" CopyToOutputDirectory="PreserveNewest" />
|
||||
<None Update="TestData\astrid-animator.aa" CopyToOutputDirectory="PreserveNewest" />
|
||||
<None Update="TestData\test-tileset.json" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\astrid-animator-atlas.json" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\astrid-animator.aa" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\test-tileset.json" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\test-atlas.json" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\isometric.tmx" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\isometric_tileset.png" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\level01.tmx" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\template.tx" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\test-object-layer.tmx" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\test-tileset-base64.tmx" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\test-tileset-csv.tmx" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\test-tileset-gzip.tmx" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\test-tileset-xml.tmx" CopyToOutputDirectory="PreserveNewest" />
|
||||
<Content Include="TestData\test-tileset-zlib.tmx" CopyToOutputDirectory="PreserveNewest" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
Reference in New Issue
Block a user