update framework

Animation/Aether.Animation.MonoAndroid.csproj

@@ -40,7 +40,11 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
-    <PackageReference Include="MonoGame.Framework.Android.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="MonoGame.Framework.Android.9000" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Animation/Aether.Animation.NET4.DX.csproj

@@ -36,7 +36,11 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="mscorlib" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Animation/Aether.Animation.NET4.csproj

@@ -36,7 +36,11 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="mscorlib" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Animation/Aether.Animation.NETSTANDARD.DX.csproj

@@ -18,7 +18,11 @@
     <DefineConstants>TRACE;WINDOWS MG MAPPEDMEM</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Animation/Aether.Animation.NETSTANDARD.csproj

@@ -18,7 +18,11 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Animation/Aether.Animation.UAP.csproj

@@ -140,7 +140,11 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Atlas/Aether.Atlas.NET4.csproj

@@ -31,7 +31,11 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Atlas/Aether.Atlas.NETSTANDARD.csproj

@@ -18,7 +18,11 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/AnimationImporters/AnimationImporters.NET4.csproj

@@ -49,11 +49,19 @@
     <Compile Include="Properties\AssemblyInfo.MG.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/AnimationImporters/AnimationImporters.NETSTANDARD.csproj

@@ -35,11 +35,19 @@
     <Compile Include="Properties\AssemblyInfo.MG.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/AtlasImporter/AtlasImporter.NET4.csproj

@@ -31,11 +31,19 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.XML" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/AtlasImporter/AtlasImporter.NETSTANDARD.csproj

@@ -18,11 +18,19 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/DDSImporter/DDSImporter.NET4.csproj

@@ -30,11 +30,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/DDSImporter/DDSImporter.NETSTANDARD.csproj

@@ -18,11 +18,19 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/GraphicsImporters/GraphicsImporters.NET4.csproj

@@ -31,11 +31,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/GraphicsImporters/GraphicsImporters.NETSTANDARD.csproj

@@ -17,11 +17,19 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/RawModelProcessor/RawModelProcessor.NET4.csproj

@@ -28,11 +28,19 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/RawModelProcessor/RawModelProcessor.NETSTANDARD.csproj

@@ -17,11 +17,19 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/SLMCImporter/SLMCImporter.NET4.csproj

@@ -31,11 +31,19 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/SLMCImporter/SLMCImporter.NETSTANDARD.csproj

@@ -18,11 +18,19 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/TilemapImporters/TilemapImporter.NET4.csproj

@@ -31,11 +31,19 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.XML" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/TilemapImporters/TilemapImporter.NETSTANDARD.csproj

@@ -18,11 +18,19 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/VoxelImporters/VoxelImporters.NET4.csproj

@@ -42,11 +42,19 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Content.Pipeline/VoxelImporters/VoxelImporters.NETSTANDARD.csproj

@@ -31,11 +31,19 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Graphics/Aether.Graphics.NET4.csproj

@@ -30,7 +30,11 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Graphics/Aether.Graphics.NETSTANDARD.csproj

@@ -17,7 +17,11 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Samples/Animation/Samples.Animation.DESKTOPGL.NET6.csproj

@@ -31,6 +31,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\netstandard2.0\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Animation/Samples.Animation.WINDOWS.NET6.csproj

@@ -32,6 +32,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\net6.0-windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Animation/Samples.Animation.WINDOWS.csproj

@@ -45,6 +45,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\net40\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Atlas/Samples.Atlas.DESKTOPGL.NET6.csproj

@@ -31,6 +31,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\netstandard2.0\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Atlas/Samples.Atlas.WINDOWS.NET6.csproj

@@ -32,6 +32,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\net6.0-windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Atlas/Samples.Atlas.WINDOWS.csproj

@@ -45,6 +45,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\net40\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Deferred/Samples.Deferred.DESKTOPGL.NET6.csproj

@@ -34,6 +34,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\netstandard2.0\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Deferred/Samples.Deferred.WINDOWS.NET6.csproj

@@ -35,6 +35,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\net6.0-windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Deferred/Samples.Deferred.WINDOWS.csproj

@@ -48,6 +48,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\net40\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/FXAA/Samples.FXAA.DESKTOPGL.NET6.csproj

@@ -33,6 +33,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\netstandard2.0\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/FXAA/Samples.FXAA.WINDOWS.NET6.csproj

@@ -34,6 +34,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\net6.0-windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/FXAA/Samples.FXAA.WINDOWS.csproj

@@ -47,6 +47,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\net40\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/SLMC/Samples.SLMC.DESKTOPGL.NET6.csproj

@@ -31,6 +31,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\netstandard2.0\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/SLMC/Samples.SLMC.WINDOWS.NET6.csproj

@@ -32,6 +32,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\net6.0-windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/SLMC/Samples.SLMC.WINDOWS.csproj

@@ -45,6 +45,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\net40\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Tilemap/Samples.Tilemaps.DESKTOPGL.NET6.csproj

@@ -31,6 +31,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\netstandard2.0\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Tilemap/Samples.Tilemaps.WINDOWS.NET6.csproj

@@ -32,6 +32,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\netstandard2.0\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\net6.0-windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Samples/Tilemap/Samples.Tilemaps.WINDOWS.csproj

@@ -45,6 +45,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Xna.Framework">
+      <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Framework\net40\Xna.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="MonoGame.Framework">
       <HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\Windows\MonoGame.Framework.dll</HintPath>
     </Reference>

Shaders/Deferred/Aether.Shaders.Deferred.NET4.csproj

@@ -28,7 +28,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/Deferred/Aether.Shaders.Deferred.NETSTANDARD.csproj

@@ -17,7 +17,11 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/Deferred/Aether.Shaders.Deferred.UAP.csproj

@@ -148,7 +148,11 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/Deferred/Shaders/DeferredBasicEffect.fx

@@ -6,10 +6,9 @@ float4x4 Projection;
 float specularIntensity = 0.8f;
 float specularPower = 0.5f; 
 
-texture Texture;
-sampler diffuseSampler = sampler_state
+DECLARE_TEXTURE(Diffuse, 0) = sampler_state
 {
-    Texture = (Texture);
+    Texture = (Diffuse);
     MAGFILTER = LINEAR;
     MINFILTER = LINEAR;
     MIPFILTER = LINEAR;
@@ -17,8 +16,7 @@ sampler diffuseSampler = sampler_state
     AddressV = Wrap;
 };
 
-texture SpecularMap;
-sampler specularSampler = sampler_state
+DECLARE_TEXTURE(SpecularMap, 1) = sampler_state
 {
     Texture = (SpecularMap);
     MagFilter = LINEAR;
@@ -28,8 +26,7 @@ sampler specularSampler = sampler_state
     AddressV = Wrap;
 };
 
-texture NormalMap;
-sampler normalSampler = sampler_state
+DECLARE_TEXTURE(NormalMap, 2) = sampler_state
 {
     Texture = (NormalMap);
     MagFilter = LINEAR;
@@ -86,14 +83,14 @@ struct PixelShaderOutput
 PixelShaderOutput PixelShaderFunction(VertexShaderOutput input)
 {
     PixelShaderOutput output;
-    output.Color = tex2D(diffuseSampler, input.TexCoord);
+    output.Color = SAMPLE_TEXTURE(Diffuse, input.TexCoord);
     
-    float4 specularAttributes = tex2D(specularSampler, input.TexCoord);
+    float4 specularAttributes = SAMPLE_TEXTURE(SpecularMap, input.TexCoord);
     //specular Intensity
     output.Color.a = specularAttributes.r;
     
     // read the normal from the normal map
-    float3 normalFromMap = tex2D(normalSampler, input.TexCoord);
+    float3 normalFromMap = SAMPLE_TEXTURE(NormalMap, input.TexCoord);
     //tranform to [-1,1]
     normalFromMap = 2.0f * normalFromMap - 1.0f;
 	normalFromMap = float3(0,0,1); //if we don't have a normalMap do this!

Shaders/Deferred/Shaders/DeferredCombine.fx

@@ -1,9 +1,6 @@
 #include "Macros.fxh"
 
-texture colorMap;
-texture lightMap;
-
-sampler colorSampler = sampler_state
+DECLARE_TEXTURE(colorMap, 0) = sampler_state
 {
     Texture = (colorMap);
     AddressU = CLAMP;
@@ -12,7 +9,8 @@ sampler colorSampler = sampler_state
     MinFilter = LINEAR;
     Mipfilter = LINEAR;
 };
-sampler lightSampler = sampler_state
+
+DECLARE_TEXTURE(lightMap, 1) = sampler_state
 {
     Texture = (lightMap);
     AddressU = CLAMP;
@@ -46,8 +44,8 @@ VertexShaderOutput VertexShaderFunction(VertexShaderInput input)
 
 float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
 {
-    float3 diffuseColor = tex2D(colorSampler,input.TexCoord).rgb;
-    float4 light = tex2D(lightSampler,input.TexCoord);
+    float3 diffuseColor = SAMPLE_TEXTURE(colorMap,input.TexCoord).rgb;
+    float4 light = SAMPLE_TEXTURE(lightMap,input.TexCoord);
     float3 diffuseLight = light.rgb;
     float specularLight = light.a;
 	return float4((diffuseColor * diffuseLight + specularLight),1);

Shaders/Deferred/Shaders/DeferredPointLight.fx

@@ -23,13 +23,7 @@ float lightRadius;
 float lightIntensity = 1.0f;
 
 // diffuse color, and specularIntensity in the alpha channel
-texture colorMap; 
-// normals, and specularPower in the alpha channel
-texture normalMap;
-//depth
-texture depthMap;
-
-sampler colorSampler = sampler_state
+DECLARE_TEXTURE(colorMap, 0) = sampler_state
 {
     Texture = (colorMap);
     AddressU = CLAMP;
@@ -38,18 +32,22 @@ sampler colorSampler = sampler_state
     MinFilter = LINEAR;
     Mipfilter = LINEAR;
 };
-sampler depthSampler = sampler_state
+
+// normals, and specularPower in the alpha channel
+DECLARE_TEXTURE(normalMap, 1) = sampler_state
 {
-    Texture = (depthMap);
+    Texture = (normalMap);
     AddressU = CLAMP;
     AddressV = CLAMP;
     MagFilter = POINT;
     MinFilter = POINT;
     Mipfilter = POINT;
 };
-sampler normalSampler = sampler_state
+
+//depth
+DECLARE_TEXTURE(depthMap, 2) = sampler_state
 {
-    Texture = (normalMap);
+    Texture = (depthMap);
     AddressU = CLAMP;
     AddressV = CLAMP;
     MagFilter = POINT;
@@ -57,7 +55,6 @@ sampler normalSampler = sampler_state
     Mipfilter = POINT;
 };
 
-
 struct VertexShaderInput
 {
     float3 Position : POSITION0;
@@ -94,17 +91,17 @@ float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
     texCoord -=halfPixel;
 
     //get normal data from the normalMap
-    float4 normalData = tex2D(normalSampler,texCoord);
+    float4 normalData = SAMPLE_TEXTURE(normalMap,texCoord);
     //tranform normal back into [-1,1] range
     float3 normal = 2.0f * normalData.xyz - 1.0f;
-	
+
     //get specular power
     float specularPower = normalData.a * 255;
     //get specular intensity from the colorMap
-    float specularIntensity = tex2D(colorSampler, texCoord).a;
+    float specularIntensity = SAMPLE_TEXTURE(colorMap,texCoord).a;
 
     //read depth
-    float depthVal = tex2D(depthSampler,texCoord).r;
+    float depthVal = SAMPLE_TEXTURE(depthMap,texCoord).r;
 
     //compute screen-space position
     float4 position;
@@ -117,7 +114,7 @@ float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
 
     //surface-to-light vector
     float3 lightVector = lightPosition - position;
-	
+
     //compute attenuation based on distance - linear attenuation
     float attenuation = saturate(1.0f - length(lightVector)/lightRadius);
 
@@ -125,9 +122,9 @@ float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
     lightVector = normalize(lightVector);
 
     //compute diffuse light
-    float NdL = max(0,dot(normal, lightVector)+0.2);
-    float3 diffuseLight = NdL * Color.rgb;
+    float NdL = max(0,dot(normal,lightVector)+0.2);
 	//float3 diffuseLight = Color.rgb;
+    float3 diffuseLight = NdL * Color.rgb;
 	//if(NdL==0) return float4(0,0,0,0);
 
     //reflection vector
@@ -138,7 +135,7 @@ float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
     float specularLight = specularIntensity * pow( saturate(dot(reflectionVector, directionToCamera)), specularPower);
 
     //take into account attenuation and lightIntensity.
-    return attenuation * lightIntensity * float4(diffuseLight.rgb, specularLight);
+    return attenuation * lightIntensity * float4(diffuseLight.rgb,specularLight);
 }
 
 TECHNIQUE( Standard, VertexShaderFunction, PixelShaderFunction );

Shaders/Deferred/Shaders/DeferredSpotLight.fx

@@ -28,14 +28,7 @@ float outerAngleCos;
 //control the brightness of the light
 float lightIntensity = 1.0f;
 
-// diffuse color, and specularIntensity in the alpha channel
-texture colorMap; 
-// normals, and specularPower in the alpha channel
-texture normalMap;
-//depth
-texture depthMap;
-
-sampler colorSampler = sampler_state
+DECLARE_TEXTURE(colorMap, 0) = sampler_state
 {
     Texture = (colorMap);
     AddressU = CLAMP;
@@ -44,18 +37,22 @@ sampler colorSampler = sampler_state
     MinFilter = LINEAR;
     Mipfilter = LINEAR;
 };
-sampler depthSampler = sampler_state
+
+// normals, and specularPower in the alpha channel
+DECLARE_TEXTURE(normalMap, 1) = sampler_state
 {
-    Texture = (depthMap);
+    Texture = (normalMap);
     AddressU = CLAMP;
     AddressV = CLAMP;
     MagFilter = POINT;
     MinFilter = POINT;
     Mipfilter = POINT;
 };
-sampler normalSampler = sampler_state
+
+//depth
+DECLARE_TEXTURE(depthMap, 2) = sampler_state
 {
-    Texture = (normalMap);
+    Texture = (depthMap);
     AddressU = CLAMP;
     AddressV = CLAMP;
     MagFilter = POINT;
@@ -100,16 +97,17 @@ float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
     texCoord -=halfPixel;
 
     //get normal data from the normalMap
-    float4 normalData = tex2D(normalSampler,texCoord);
+    float4 normalData = SAMPLE_TEXTURE(normalMap,texCoord);
     //tranform normal back into [-1,1] range
     float3 normal = 2.0f * normalData.xyz - 1.0f;
+
     //get specular power
     float specularPower = normalData.a * 255;
     //get specular intensity from the colorMap
-    float specularIntensity = tex2D(colorSampler, texCoord).a;
+    float specularIntensity = SAMPLE_TEXTURE(colorMap,texCoord).a;
 
     //read depth
-    float depthVal = tex2D(depthSampler,texCoord).r;
+    float depthVal = SAMPLE_TEXTURE(depthMap,texCoord).r;
 
     //compute screen-space position
     float4 position;
@@ -137,8 +135,8 @@ float4 PixelShaderFunction(VertexShaderOutput input) : COLOR0
 	
     //compute diffuse light
     float NdL = max(0,dot(normal,lightVector));
-    //float3 diffuseLight = NdL * Color.rgb;
 	float3 diffuseLight = Color.rgb;
+    //float3 diffuseLight = NdL * Color.rgb;
 
     //reflection vector
     float3 reflectionVector = normalize(reflect(-lightVector, normal));

Shaders/Deferred/Shaders/Macros.fxh

@@ -5,13 +5,23 @@
 // Copyright (C) Microsoft Corporation. All rights reserved.
 //-----------------------------------------------------------------------------
 
-#ifdef SM4
 
-// Macros for targetting shader model 4.0 (DX11)
+#ifdef MGFX  // Macros for targetting HLSL 4.0
 
 #define TECHNIQUE(name, vsname, psname ) \
 	technique name { pass { VertexShader = compile vs_4_0_level_9_1 vsname (); PixelShader = compile ps_4_0_level_9_1 psname(); } }
 
+#else  // Macros for targetting shader model 2.0 (XNA)
+
+#define TECHNIQUE(name, vsname, psname ) \
+	technique name { pass { VertexShader = compile vs_2_0 vsname (); PixelShader = compile ps_2_0 psname(); } }
+
+#endif
+
+
+#ifdef SM4  // Macros for targetting HLSL 4.0
+
+
 #define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
 #define MATRIX_CONSTANTS
 #define END_CONSTANTS       };
@@ -32,13 +42,8 @@
 #define SAMPLE_CUBEMAP(Name, texCoord)  Name.Sample(Name##Sampler, texCoord)
 
 
-#else
-
+#else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
 
-// Macros for targetting shader model 2.0 (DX9)
-
-#define TECHNIQUE(name, vsname, psname ) \
-	technique name { pass { VertexShader = compile vs_2_0 vsname (); PixelShader = compile ps_2_0 psname(); } }
 
 #define BEGIN_CONSTANTS
 #define MATRIX_CONSTANTS
@@ -49,12 +54,12 @@
 #define _cb(r)
 
 #define DECLARE_TEXTURE(Name, index) \
-    texture2D Name; \
-    sampler Name##Sampler : register(s##index)= sampler_state { Texture = (Name); };
+    texture2D Name : register(t##index); \
+    sampler Name##Sampler : register(s##index) 
 
 #define DECLARE_CUBEMAP(Name, index) \
-    textureCUBE Name; \
-    sampler Name##Sampler : register(s##index) = sampler_state { Texture = (Name); };
+    textureCUBE Name : register(t##index); \
+    sampler Name##Sampler : register(s##index) 
 
 #define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name##Sampler, texCoord)
 #define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)

Shaders/FXAA/Aether.Shaders.FXAA.NET4.csproj

@@ -28,7 +28,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/FXAA/Aether.Shaders.FXAA.NETSTANDARD.csproj

@@ -17,7 +17,11 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/FXAA/Aether.Shaders.FXAA.UAP.csproj

@@ -143,7 +143,11 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/FXAA/Shaders/Macros.fxh

@@ -5,13 +5,23 @@
 // Copyright (C) Microsoft Corporation. All rights reserved.
 //-----------------------------------------------------------------------------
 
-#ifdef SM4
 
-// Macros for targetting shader model 4.0 (DX11)
+#ifdef MGFX  // Macros for targetting HLSL 4.0
 
 #define TECHNIQUE(name, vsname, psname ) \
 	technique name { pass { VertexShader = compile vs_4_0_level_9_1 vsname (); PixelShader = compile ps_4_0_level_9_1 psname(); } }
 
+#else  // Macros for targetting shader model 2.0 (XNA)
+
+#define TECHNIQUE(name, vsname, psname ) \
+	technique name { pass { VertexShader = compile vs_2_0 vsname (); PixelShader = compile ps_2_0 psname(); } }
+
+#endif
+
+
+#ifdef SM4  // Macros for targetting HLSL 4.0
+
+
 #define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
 #define MATRIX_CONSTANTS
 #define END_CONSTANTS       };
@@ -32,13 +42,8 @@
 #define SAMPLE_CUBEMAP(Name, texCoord)  Name.Sample(Name##Sampler, texCoord)
 
 
-#else
-
+#else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
 
-// Macros for targetting shader model 2.0 (DX9)
-
-#define TECHNIQUE(name, vsname, psname ) \
-	technique name { pass { VertexShader = compile vs_2_0 vsname (); PixelShader = compile ps_2_0 psname(); } }
 
 #define BEGIN_CONSTANTS
 #define MATRIX_CONSTANTS

Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NET4.csproj

@@ -28,7 +28,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj

@@ -17,7 +17,11 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/InfiniteGrid/Shaders/Macros.fxh

@@ -5,9 +5,8 @@
 // Copyright (C) Microsoft Corporation. All rights reserved.
 //-----------------------------------------------------------------------------
 
-#ifdef SM4
 
-// Macros for targetting shader model 4.0 (DX11)
+#ifdef MGFX  // Macros for targetting HLSL 4.0
 
 #define TECHNIQUE(name, vsname, psname ) \
 	technique name { pass { VertexShader = compile vs_4_0_level_9_1 vsname (); PixelShader = compile ps_4_0_level_9_1 psname(); } }
@@ -15,6 +14,20 @@
 #define TECHNIQUE_9_3(name, vsname, psname ) \
 	technique name { pass { VertexShader = compile vs_4_0_level_9_3 vsname (); PixelShader = compile ps_4_0_level_9_3 psname(); } }
 
+#else  // Macros for targetting shader model 2.0 (XNA)
+
+#define TECHNIQUE(name, vsname, psname ) \
+	technique name { pass { VertexShader = compile vs_2_0 vsname (); PixelShader = compile ps_2_0 psname(); } }
+
+#define TECHNIQUE_9_3(name, vsname, psname ) \
+	technique name { pass { VertexShader = compile vs_3_0 vsname (); PixelShader = compile ps_3_0 psname(); } }
+
+#endif
+
+
+#ifdef SM4  // Macros for targetting HLSL 4.0
+
+
 #define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
 #define MATRIX_CONSTANTS
 #define END_CONSTANTS       };
@@ -35,16 +48,8 @@
 #define SAMPLE_CUBEMAP(Name, texCoord)  Name.Sample(Name##Sampler, texCoord)
 
 
-#else
-
+#else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
 
-// Macros for targetting shader model 2.0 (DX9)
-
-#define TECHNIQUE(name, vsname, psname ) \
-	technique name { pass { VertexShader = compile vs_2_0 vsname (); PixelShader = compile ps_2_0 psname(); } }
-
-#define TECHNIQUE_9_3(name, vsname, psname ) \
-	technique name { pass { VertexShader = compile vs_3_0 vsname (); PixelShader = compile ps_3_0 psname(); } }
 
 #define BEGIN_CONSTANTS
 #define MATRIX_CONSTANTS
@@ -55,12 +60,12 @@
 #define _cb(r)
 
 #define DECLARE_TEXTURE(Name, index) \
-    texture2D Name; \
-    sampler Name##Sampler : register(s##index)= sampler_state { Texture = (Name); };
+    texture2D Name : register(t##index); \
+    sampler Name##Sampler : register(s##index) 
 
 #define DECLARE_CUBEMAP(Name, index) \
-    textureCUBE Name; \
-    sampler Name##Sampler : register(s##index) = sampler_state { Texture = (Name); };
+    textureCUBE Name : register(t##index); \
+    sampler Name##Sampler : register(s##index) 
 
 #define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name##Sampler, texCoord)
 #define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)

Shaders/Tilemap/Aether.Shaders.Tilemap.NET4.csproj

@@ -40,7 +40,11 @@
     <EmbeddedResource Include="Resources\TilemapEffect.ogl.fxo.10" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/Tilemap/Aether.Shaders.Tilemap.NETSTANDARD.csproj

@@ -27,7 +27,11 @@
     <EmbeddedResource Include="Resources\TilemapEffect.ogl.fxo.10" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Shaders/Tilemap/Shaders/Macros.fxh

@@ -5,14 +5,23 @@
 // Copyright (C) Microsoft Corporation. All rights reserved.
 //-----------------------------------------------------------------------------
 
-#ifdef SM4
 
-
-// Macros for targetting shader model 4.0 (DX11)
+#ifdef MGFX  // Macros for targetting HLSL 4.0
 
 #define TECHNIQUE(name, vsname, psname ) \
 	technique name { pass { VertexShader = compile vs_4_0_level_9_1 vsname (); PixelShader = compile ps_4_0_level_9_1 psname(); } }
 
+#else  // Macros for targetting shader model 2.0 (XNA)
+
+#define TECHNIQUE(name, vsname, psname ) \
+	technique name { pass { VertexShader = compile vs_2_0 vsname (); PixelShader = compile ps_2_0 psname(); } }
+
+#endif
+
+
+#ifdef SM4  // Macros for targetting HLSL 4.0
+
+
 #define BEGIN_CONSTANTS     cbuffer Parameters : register(b0) {
 #define MATRIX_CONSTANTS
 #define END_CONSTANTS       };
@@ -33,13 +42,8 @@
 #define SAMPLE_CUBEMAP(Name, texCoord)  Name.Sample(Name##Sampler, texCoord)
 
 
-#else
-
+#else  // Macros for targetting shader model 2.0 (XNA & MojoShader)
 
-// Macros for targetting shader model 2.0 (DX9)
-
-#define TECHNIQUE(name, vsname, psname ) \
-	technique name { pass { VertexShader = compile vs_2_0 vsname (); PixelShader = compile ps_2_0 psname(); } }
 
 #define BEGIN_CONSTANTS
 #define MATRIX_CONSTANTS
@@ -50,12 +54,12 @@
 #define _cb(r)
 
 #define DECLARE_TEXTURE(Name, index) \
-    texture2D Name; \
-    sampler Name##Sampler : register(s##index)= sampler_state { Texture = (Name); };
+    texture2D Name : register(t##index); \
+    sampler Name##Sampler : register(s##index) 
 
 #define DECLARE_CUBEMAP(Name, index) \
-    textureCUBE Name; \
-    sampler Name##Sampler : register(s##index) = sampler_state { Texture = (Name); };
+    textureCUBE Name : register(t##index); \
+    sampler Name##Sampler : register(s##index) 
 
 #define SAMPLE_TEXTURE(Name, texCoord)  tex2D(Name##Sampler, texCoord)
 #define SAMPLE_CUBEMAP(Name, texCoord)  texCUBE(Name##Sampler, texCoord)

Shaders/Tilemap/Shaders/TilemapEffect.fx

@@ -1,12 +1,7 @@
 #include "Macros.fxh"
 
 
-#ifdef SM4
-DECLARE_TEXTURE(Texture, 0);
-DECLARE_TEXTURE(TextureAtlas, 1);
-#else
-texture Texture;
-sampler TextureSampler : register(s0) = sampler_state
+DECLARE_TEXTURE(Texture, 0) = sampler_state
 {
 	Texture = (Texture);
 	MAGFILTER = POINT;
@@ -15,8 +10,8 @@ sampler TextureSampler : register(s0) = sampler_state
 	AddressU = Wrap;
 	AddressV = Wrap;
 };
-texture TextureAtlas;
-sampler TextureAtlasSampler : register(s1) = sampler_state
+
+DECLARE_TEXTURE(TextureAtlas, 1) = sampler_state
 {
     Texture = (TextureAtlas);
 	MAGFILTER = POINT; //LINEAR;
@@ -25,7 +20,6 @@ sampler TextureAtlasSampler : register(s1) = sampler_state
 	AddressU = Wrap;
 	AddressV = Wrap;
 };
-#endif
 
 
 BEGIN_CONSTANTS

Tilemap/Aether.Tilemap.NET4.csproj

@@ -31,7 +31,11 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>

Tilemap/Aether.Tilemap.NETSTANDARD.csproj

@@ -18,7 +18,11 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MonoGame.Framework.Portable.9000" Version="3.8.9102">
+    <PackageReference Include="nkast.Xna.Framework" Version="3.9.9001">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework.Ref" Version="3.9.9001">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>