Browse Source

update Framework (v.3.11)

Nick Kastellanos 1 year ago
parent
commit
b970e9aad3
63 changed files with 406 additions and 184 deletions
  1. 6 2
      Animation/Aether.Animation.NET4.DX.csproj
  2. 6 2
      Animation/Aether.Animation.NET4.csproj
  3. 6 2
      Animation/Aether.Animation.NETSTANDARD.DX.csproj
  4. 6 2
      Animation/Aether.Animation.NETSTANDARD.csproj
  5. 6 2
      Animation/Aether.Animation.UAP.csproj
  6. 6 2
      Atlas/Aether.Atlas.NET4.csproj
  7. 6 2
      Atlas/Aether.Atlas.NETSTANDARD.csproj
  8. 8 4
      Content.Pipeline/AnimationImporters/AnimationImporters.NET4.csproj
  9. 8 4
      Content.Pipeline/AnimationImporters/AnimationImporters.NETSTANDARD.csproj
  10. 8 4
      Content.Pipeline/AtlasImporter/AtlasImporter.NET4.csproj
  11. 8 4
      Content.Pipeline/AtlasImporter/AtlasImporter.NETSTANDARD.csproj
  12. 8 4
      Content.Pipeline/DDSImporter/DDSImporter.NET4.csproj
  13. 8 4
      Content.Pipeline/DDSImporter/DDSImporter.NETSTANDARD.csproj
  14. 8 4
      Content.Pipeline/GraphicsImporters/GraphicsImporters.NET4.csproj
  15. 8 4
      Content.Pipeline/GraphicsImporters/GraphicsImporters.NETSTANDARD.csproj
  16. 8 4
      Content.Pipeline/RawModelProcessor/RawModelProcessor.NET4.csproj
  17. 8 4
      Content.Pipeline/RawModelProcessor/RawModelProcessor.NETSTANDARD.csproj
  18. 8 4
      Content.Pipeline/SLMCImporter/SLMCImporter.NET4.csproj
  19. 8 4
      Content.Pipeline/SLMCImporter/SLMCImporter.NETSTANDARD.csproj
  20. 8 4
      Content.Pipeline/TilemapImporters/TilemapImporter.NET4.csproj
  21. 8 4
      Content.Pipeline/TilemapImporters/TilemapImporter.NETSTANDARD.csproj
  22. 8 4
      Content.Pipeline/VoxelImporters/VoxelImporters.NET4.csproj
  23. 8 4
      Content.Pipeline/VoxelImporters/VoxelImporters.NETSTANDARD.csproj
  24. 6 2
      Graphics/Aether.Graphics.NET4.csproj
  25. 6 2
      Graphics/Aether.Graphics.NETSTANDARD.csproj
  26. 8 3
      Samples/Animation/Samples.Animation.DESKTOPGL.NET6.csproj
  27. 8 3
      Samples/Animation/Samples.Animation.WINDOWS.NET6.csproj
  28. 8 3
      Samples/Animation/Samples.Animation.WINDOWS.csproj
  29. 8 3
      Samples/Atlas/Samples.Atlas.DESKTOPGL.NET6.csproj
  30. 8 3
      Samples/Atlas/Samples.Atlas.WINDOWS.NET6.csproj
  31. 8 3
      Samples/Atlas/Samples.Atlas.WINDOWS.csproj
  32. 8 3
      Samples/Deferred/Samples.Deferred.DESKTOPGL.NET6.csproj
  33. 8 3
      Samples/Deferred/Samples.Deferred.WINDOWS.NET6.csproj
  34. 8 3
      Samples/Deferred/Samples.Deferred.WINDOWS.csproj
  35. 8 3
      Samples/FXAA/Samples.FXAA.DESKTOPGL.NET6.csproj
  36. 8 3
      Samples/FXAA/Samples.FXAA.WINDOWS.NET6.csproj
  37. 8 3
      Samples/FXAA/Samples.FXAA.WINDOWS.csproj
  38. 8 3
      Samples/SLMC/Samples.SLMC.DESKTOPGL.NET6.csproj
  39. 8 3
      Samples/SLMC/Samples.SLMC.WINDOWS.NET6.csproj
  40. 8 3
      Samples/SLMC/Samples.SLMC.WINDOWS.csproj
  41. 8 3
      Samples/Tilemap/Samples.Tilemaps.DESKTOPGL.NET6.csproj
  42. 8 3
      Samples/Tilemap/Samples.Tilemaps.WINDOWS.NET6.csproj
  43. 8 3
      Samples/Tilemap/Samples.Tilemaps.WINDOWS.csproj
  44. 2 2
      Shaders/Deferred/Aether.Shaders.Deferred.NET4.csproj
  45. 2 2
      Shaders/Deferred/Aether.Shaders.Deferred.NETSTANDARD.csproj
  46. 2 2
      Shaders/Deferred/Aether.Shaders.Deferred.UAP.csproj
  47. 5 3
      Shaders/Deferred/DeferredBasicEffect.cs
  48. 5 3
      Shaders/Deferred/DeferredClearGBufferEffect.cs
  49. 5 3
      Shaders/Deferred/DeferredCombineEffect.cs
  50. 5 3
      Shaders/Deferred/DeferredPointLightEffect.cs
  51. 5 3
      Shaders/Deferred/DeferredSpotLightEffect.cs
  52. 2 2
      Shaders/FXAA/Aether.Shaders.FXAA.NET4.csproj
  53. 2 2
      Shaders/FXAA/Aether.Shaders.FXAA.NETSTANDARD.csproj
  54. 2 2
      Shaders/FXAA/Aether.Shaders.FXAA.UAP.csproj
  55. 5 3
      Shaders/FXAA/FXAAEffect.cs
  56. 6 2
      Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NET4.csproj
  57. 6 2
      Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj
  58. 5 3
      Shaders/InfiniteGrid/InfiniteGridEffect.cs
  59. 2 2
      Shaders/Tilemap/Aether.Shaders.Tilemap.NET4.csproj
  60. 2 2
      Shaders/Tilemap/Aether.Shaders.Tilemap.NETSTANDARD.csproj
  61. 5 3
      Shaders/Tilemap/TilemapEffect.cs
  62. 6 2
      Tilemap/Aether.Tilemap.NET4.csproj
  63. 6 2
      Tilemap/Aether.Tilemap.NETSTANDARD.csproj

+ 6 - 2
Animation/Aether.Animation.NET4.DX.csproj

@@ -36,11 +36,15 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="mscorlib" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Animation/Aether.Animation.NET4.csproj

@@ -36,11 +36,15 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="mscorlib" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Animation/Aether.Animation.NETSTANDARD.DX.csproj

@@ -18,11 +18,15 @@
     <DefineConstants>TRACE;WINDOWS MG MAPPEDMEM</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Animation/Aether.Animation.NETSTANDARD.csproj

@@ -18,11 +18,15 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Animation/Aether.Animation.UAP.csproj

@@ -140,11 +140,15 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Atlas/Aether.Atlas.NET4.csproj

@@ -31,11 +31,15 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Atlas/Aether.Atlas.NETSTANDARD.csproj

@@ -18,11 +18,15 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/AnimationImporters/AnimationImporters.NET4.csproj

@@ -49,19 +49,23 @@
     <Compile Include="Properties\AssemblyInfo.MG.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/AnimationImporters/AnimationImporters.NETSTANDARD.csproj

@@ -35,19 +35,23 @@
     <Compile Include="Properties\AssemblyInfo.MG.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/AtlasImporter/AtlasImporter.NET4.csproj

@@ -31,19 +31,23 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.XML" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/AtlasImporter/AtlasImporter.NETSTANDARD.csproj

@@ -18,19 +18,23 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/DDSImporter/DDSImporter.NET4.csproj

@@ -30,19 +30,23 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/DDSImporter/DDSImporter.NETSTANDARD.csproj

@@ -18,19 +18,23 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/GraphicsImporters/GraphicsImporters.NET4.csproj

@@ -31,19 +31,23 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/GraphicsImporters/GraphicsImporters.NETSTANDARD.csproj

@@ -17,19 +17,23 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/RawModelProcessor/RawModelProcessor.NET4.csproj

@@ -28,19 +28,23 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/RawModelProcessor/RawModelProcessor.NETSTANDARD.csproj

@@ -17,19 +17,23 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/SLMCImporter/SLMCImporter.NET4.csproj

@@ -31,19 +31,23 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/SLMCImporter/SLMCImporter.NETSTANDARD.csproj

@@ -18,19 +18,23 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/TilemapImporters/TilemapImporter.NET4.csproj

@@ -31,19 +31,23 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.XML" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/TilemapImporters/TilemapImporter.NETSTANDARD.csproj

@@ -18,19 +18,23 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/VoxelImporters/VoxelImporters.NET4.csproj

@@ -42,19 +42,23 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 4
Content.Pipeline/VoxelImporters/VoxelImporters.NETSTANDARD.csproj

@@ -31,19 +31,23 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Graphics/Aether.Graphics.NET4.csproj

@@ -30,11 +30,15 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Graphics/Aether.Graphics.NETSTANDARD.csproj

@@ -17,11 +17,15 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 8 - 3
Samples/Animation/Samples.Animation.DESKTOPGL.NET6.csproj

@@ -31,8 +31,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.10.9001" />
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -46,5 +51,5 @@
     <ProjectReference Include="..\..\Animation\Aether.Animation.NETSTANDARD.csproj" />
     <ProjectReference Include="..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj" />
   </ItemGroup>
-  <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Animation/Samples.Animation.WINDOWS.NET6.csproj

@@ -32,8 +32,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -47,5 +52,5 @@
     <ProjectReference Include="..\..\Animation\Aether.Animation.NETSTANDARD.DX.csproj" />
     <ProjectReference Include="..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj" />
   </ItemGroup>
-  <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Animation/Samples.Animation.WINDOWS.csproj

@@ -45,8 +45,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
@@ -70,5 +75,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Atlas/Samples.Atlas.DESKTOPGL.NET6.csproj

@@ -31,8 +31,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -45,5 +50,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Atlas\Aether.Atlas.NETSTANDARD.csproj" />
   </ItemGroup>
-  <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Atlas/Samples.Atlas.WINDOWS.NET6.csproj

@@ -32,8 +32,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -46,5 +51,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Atlas\Aether.Atlas.NETSTANDARD.csproj" />
   </ItemGroup>
-    <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Atlas/Samples.Atlas.WINDOWS.csproj

@@ -45,8 +45,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
@@ -66,5 +71,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Deferred/Samples.Deferred.DESKTOPGL.NET6.csproj

@@ -34,8 +34,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -48,5 +53,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj" />
   </ItemGroup>
-  <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Deferred/Samples.Deferred.WINDOWS.NET6.csproj

@@ -35,8 +35,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -49,5 +54,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj" />
   </ItemGroup>
-    <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Deferred/Samples.Deferred.WINDOWS.csproj

@@ -48,8 +48,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
@@ -69,5 +74,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/FXAA/Samples.FXAA.DESKTOPGL.NET6.csproj

@@ -33,8 +33,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -47,5 +52,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Shaders\FXAA\Aether.Shaders.FXAA.NETSTANDARD.csproj" />
   </ItemGroup>
-  <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/FXAA/Samples.FXAA.WINDOWS.NET6.csproj

@@ -34,8 +34,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -48,5 +53,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Shaders\FXAA\Aether.Shaders.FXAA.NETSTANDARD.csproj" />
   </ItemGroup>
-    <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/FXAA/Samples.FXAA.WINDOWS.csproj

@@ -47,8 +47,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
@@ -68,5 +73,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/SLMC/Samples.SLMC.DESKTOPGL.NET6.csproj

@@ -31,8 +31,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -42,5 +47,5 @@
       <Link>Content\Content.mgcb</Link>
     </KniContentReference>
   </ItemGroup>
-  <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/SLMC/Samples.SLMC.WINDOWS.NET6.csproj

@@ -32,8 +32,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -43,5 +48,5 @@
       <Link>Content\Content.mgcb</Link>
     </KniContentReference>
   </ItemGroup>
-    <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/SLMC/Samples.SLMC.WINDOWS.csproj

@@ -45,8 +45,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
@@ -62,5 +67,5 @@
   <ItemGroup>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Tilemap/Samples.Tilemaps.DESKTOPGL.NET6.csproj

@@ -31,8 +31,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+    <PackageReference Include="MonoGame.Framework.DesktopGL.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -47,5 +52,5 @@
     <ProjectReference Include="..\..\Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj" />
     <ProjectReference Include="..\..\Tilemap\Aether.Tilemap.NETSTANDARD.csproj" />
   </ItemGroup>
-  <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Tilemap/Samples.Tilemaps.WINDOWS.NET6.csproj

@@ -32,8 +32,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Icon.ico" />
@@ -48,5 +53,5 @@
     <ProjectReference Include="..\..\Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj" />
     <ProjectReference Include="..\..\Tilemap\Aether.Tilemap.NETSTANDARD.csproj" />
   </ItemGroup>
-    <Import Project="C:\Program Files (x86)\MSBuild\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 8 - 3
Samples/Tilemap/Samples.Tilemaps.WINDOWS.csproj

@@ -45,8 +45,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-	<PackageReference Include="nkast.Xna.Framework" Version="3.10.9001" />
-	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.10.9001" />
+	<PackageReference Include="nkast.Xna.Framework" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Audio" Version="3.11.9002" />
+	<PackageReference Include="nkast.Xna.Framework.Media" Version="3.11.9002" />
+	<PackageReference Include="MonoGame.Framework.WindowsDX.9000" Version="3.11.9002" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Builder" Version="3.11.9002" />
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
@@ -74,5 +79,5 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\Kni.Content.Builder.targets" />
+
 </Project>

+ 2 - 2
Shaders/Deferred/Aether.Shaders.Deferred.NET4.csproj

@@ -28,11 +28,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 2 - 2
Shaders/Deferred/Aether.Shaders.Deferred.NETSTANDARD.csproj

@@ -17,11 +17,11 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 2 - 2
Shaders/Deferred/Aether.Shaders.Deferred.UAP.csproj

@@ -148,11 +148,11 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 5 - 3
Shaders/Deferred/DeferredBasicEffect.cs

@@ -57,12 +57,14 @@ namespace nkast.Aether.Shaders
 #if XNA
             platformName = ".xna.WinReach";
 #else
-            switch (MonoGame.Framework.Utilities.PlatformInfo.GraphicsBackend)
+            switch (graphicsDevice.Adapter.Backend)
             {
-                case MonoGame.Framework.Utilities.GraphicsBackend.DirectX:
+                case GraphicsBackend.DirectX11:
                     platformName = ".dx11.fxo";
                     break;
-                case MonoGame.Framework.Utilities.GraphicsBackend.OpenGL:
+                case GraphicsBackend.OpenGL:
+                case GraphicsBackend.GLES:
+                case GraphicsBackend.WebGL:
                     platformName = ".ogl.fxo";
                     break;
                 default:

+ 5 - 3
Shaders/Deferred/DeferredClearGBufferEffect.cs

@@ -52,12 +52,14 @@ namespace nkast.Aether.Shaders
 #if XNA
             platformName = ".xna.WinReach";
 #else
-            switch (MonoGame.Framework.Utilities.PlatformInfo.GraphicsBackend)
+            switch (graphicsDevice.Adapter.Backend)
             {
-                case MonoGame.Framework.Utilities.GraphicsBackend.DirectX:
+                case GraphicsBackend.DirectX11:
                     platformName = ".dx11.fxo";
                     break;
-                case MonoGame.Framework.Utilities.GraphicsBackend.OpenGL:
+                case GraphicsBackend.OpenGL:
+                case GraphicsBackend.GLES:
+                case GraphicsBackend.WebGL:
                     platformName = ".ogl.fxo";
                     break;
                 default:

+ 5 - 3
Shaders/Deferred/DeferredCombineEffect.cs

@@ -56,12 +56,14 @@ namespace nkast.Aether.Shaders
 #if XNA
             platformName = ".xna.WinReach";
 #else
-            switch (MonoGame.Framework.Utilities.PlatformInfo.GraphicsBackend)
+            switch (graphicsDevice.Adapter.Backend)
             {
-                case MonoGame.Framework.Utilities.GraphicsBackend.DirectX:
+                case GraphicsBackend.DirectX11:
                     platformName = ".dx11.fxo";
                     break;
-                case MonoGame.Framework.Utilities.GraphicsBackend.OpenGL:
+                case GraphicsBackend.OpenGL:
+                case GraphicsBackend.GLES:
+                case GraphicsBackend.WebGL:
                     platformName = ".ogl.fxo";
                     break;
                 default:

+ 5 - 3
Shaders/Deferred/DeferredPointLightEffect.cs

@@ -69,12 +69,14 @@ namespace nkast.Aether.Shaders
 #if XNA
             platformName = ".xna.WinReach";
 #else
-            switch (MonoGame.Framework.Utilities.PlatformInfo.GraphicsBackend)
+            switch (graphicsDevice.Adapter.Backend)
             {
-                case MonoGame.Framework.Utilities.GraphicsBackend.DirectX:
+                case GraphicsBackend.DirectX11:
                     platformName = ".dx11.fxo";
                     break;
-                case MonoGame.Framework.Utilities.GraphicsBackend.OpenGL:
+                case GraphicsBackend.OpenGL:
+                case GraphicsBackend.GLES:
+                case GraphicsBackend.WebGL:
                     platformName = ".ogl.fxo";
                     break;
                 default:

+ 5 - 3
Shaders/Deferred/DeferredSpotLightEffect.cs

@@ -74,12 +74,14 @@ namespace nkast.Aether.Shaders
 #if XNA
             platformName = ".xna.WinReach";
 #else
-            switch (MonoGame.Framework.Utilities.PlatformInfo.GraphicsBackend)
+            switch (graphicsDevice.Adapter.Backend)
             {
-                case MonoGame.Framework.Utilities.GraphicsBackend.DirectX:
+                case GraphicsBackend.DirectX11:
                     platformName = ".dx11.fxo";
                     break;
-                case MonoGame.Framework.Utilities.GraphicsBackend.OpenGL:
+                case GraphicsBackend.OpenGL:
+                case GraphicsBackend.GLES:
+                case GraphicsBackend.WebGL:
                     platformName = ".ogl.fxo";
                     break;
                 default:

+ 2 - 2
Shaders/FXAA/Aether.Shaders.FXAA.NET4.csproj

@@ -28,11 +28,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 2 - 2
Shaders/FXAA/Aether.Shaders.FXAA.NETSTANDARD.csproj

@@ -17,11 +17,11 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 2 - 2
Shaders/FXAA/Aether.Shaders.FXAA.UAP.csproj

@@ -143,11 +143,11 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 5 - 3
Shaders/FXAA/FXAAEffect.cs

@@ -67,12 +67,14 @@ namespace nkast.Aether.Shaders
 #if XNA
             platformName = ".xna.WinHiDef";
 #else
-            switch (MonoGame.Framework.Utilities.PlatformInfo.GraphicsBackend)
+            switch (graphicsDevice.Adapter.Backend)
             {
-                case MonoGame.Framework.Utilities.GraphicsBackend.DirectX:
+                case GraphicsBackend.DirectX11:
                     platformName = ".dx11.fxo";
                     break;
-                case MonoGame.Framework.Utilities.GraphicsBackend.OpenGL:
+                case GraphicsBackend.OpenGL:
+                case GraphicsBackend.GLES:
+                case GraphicsBackend.WebGL:
                     platformName = ".ogl.fxo";
                     break;
                 default:

+ 6 - 2
Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NET4.csproj

@@ -28,11 +28,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj

@@ -17,11 +17,15 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 5 - 3
Shaders/InfiniteGrid/InfiniteGridEffect.cs

@@ -50,12 +50,14 @@ namespace nkast.Aether.Shaders
 #if XNA
             platformName = ".xna";
 #else
-            switch (MonoGame.Framework.Utilities.PlatformInfo.GraphicsBackend)
+            switch (graphicsDevice.Adapter.Backend)
             {
-                case MonoGame.Framework.Utilities.GraphicsBackend.DirectX:
+                case GraphicsBackend.DirectX11:
                     platformName = ".dx11.fxo";
                     break;
-                case MonoGame.Framework.Utilities.GraphicsBackend.OpenGL:
+                case GraphicsBackend.OpenGL:
+                case GraphicsBackend.GLES:
+                case GraphicsBackend.WebGL:
                     platformName = ".ogl.fxo";
                     break;
                 default:

+ 2 - 2
Shaders/Tilemap/Aether.Shaders.Tilemap.NET4.csproj

@@ -40,11 +40,11 @@
     <EmbeddedResource Include="Resources\TilemapEffect.ogl.fxo.10" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 2 - 2
Shaders/Tilemap/Aether.Shaders.Tilemap.NETSTANDARD.csproj

@@ -27,11 +27,11 @@
     <EmbeddedResource Include="Resources\TilemapEffect.ogl.fxo.10" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 5 - 3
Shaders/Tilemap/TilemapEffect.cs

@@ -84,12 +84,14 @@ namespace nkast.Aether.Shaders
 #if XNA
             platformName = ".xna.WinReach";
 #else
-            switch (MonoGame.Framework.Utilities.PlatformInfo.GraphicsBackend)
+            switch (graphicsDevice.Adapter.Backend)
             {
-                case MonoGame.Framework.Utilities.GraphicsBackend.DirectX:
+                case GraphicsBackend.DirectX11:
                     platformName = ".dx11.fxo";
                     break;
-                case MonoGame.Framework.Utilities.GraphicsBackend.OpenGL:
+                case GraphicsBackend.OpenGL:
+                case GraphicsBackend.GLES:
+                case GraphicsBackend.WebGL:
                     platformName = ".ogl.fxo";
                     break;
                 default:

+ 6 - 2
Tilemap/Aether.Tilemap.NET4.csproj

@@ -31,11 +31,15 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

+ 6 - 2
Tilemap/Aether.Tilemap.NETSTANDARD.csproj

@@ -18,11 +18,15 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.10.9001">
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="3.11.9002">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="3.11.9002">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>