Browse Source

merge shader projects

Nikos Kastellanos 5 months ago
parent
commit
1cf6369500
37 changed files with 66 additions and 321 deletions
  1. 4 4
      Aether.Extras.NET4.sln
  2. 4 4
      Aether.Extras.NETSTANDARD.sln
  3. 4 4
      Samples.DESKTOPGL.NET8.sln
  4. 4 4
      Samples.WINDOWS.NET8.sln
  5. 4 4
      Samples.WINDOWS.sln
  6. 1 1
      Samples/Animation.sln
  7. 1 1
      Samples/Animation/Animation.Android/Animation.Android.csproj
  8. 1 1
      Samples/Animation/Animation.BlazorGL/Animation.BlazorGL.csproj
  9. 1 1
      Samples/Animation/Animation.DesktopGL/Animation.DesktopGL.csproj
  10. 1 1
      Samples/Animation/Animation.Shared/Samples.Animation.DESKTOPGL.NET8.csproj
  11. 1 1
      Samples/Animation/Animation.Shared/Samples.Animation.WINDOWS.NET8.csproj
  12. 2 2
      Samples/Animation/Animation.Shared/Samples.Animation.WINDOWS.csproj
  13. 1 1
      Samples/Animation/Animation.WindowsDX/Animation.WindowsDX.csproj
  14. 1 1
      Samples/Deferred.sln
  15. 1 1
      Samples/Deferred/Deferred.Android/Deferred.Android.csproj
  16. 1 1
      Samples/Deferred/Deferred.BlazorGL/Deferred.BlazorGL.csproj
  17. 1 1
      Samples/Deferred/Deferred.DesktopGL/Deferred.DesktopGL.csproj
  18. 1 1
      Samples/Deferred/Deferred.Shared/Samples.Deferred.DESKTOPGL.NET8.csproj
  19. 1 1
      Samples/Deferred/Deferred.Shared/Samples.Deferred.WINDOWS.NET8.csproj
  20. 2 2
      Samples/Deferred/Deferred.Shared/Samples.Deferred.WINDOWS.csproj
  21. 1 1
      Samples/Deferred/Deferred.WindowsDX/Deferred.WindowsDX.csproj
  22. 1 1
      Samples/FXAA/FXAA.Shared/Samples.FXAA.DESKTOPGL.NET8.csproj
  23. 1 1
      Samples/FXAA/FXAA.Shared/Samples.FXAA.WINDOWS.NET8.csproj
  24. 2 2
      Samples/FXAA/FXAA.Shared/Samples.FXAA.WINDOWS.csproj
  25. 1 1
      Samples/Tilemap/Tilemap.Shared/Samples.Tilemaps.DESKTOPGL.NET8.csproj
  26. 1 1
      Samples/Tilemap/Tilemap.Shared/Samples.Tilemaps.WINDOWS.NET8.csproj
  27. 2 2
      Samples/Tilemap/Tilemap.Shared/Samples.Tilemaps.WINDOWS.csproj
  28. 0 63
      Shaders/Deferred/Aether.Shaders.Deferred.NET4.csproj
  29. 4 9
      Shaders/Deferred/Aether.Shaders.Deferred.csproj
  30. 0 58
      Shaders/FXAA/Aether.Shaders.FXAA.NET4.csproj
  31. 4 9
      Shaders/FXAA/Aether.Shaders.FXAA.csproj
  32. 0 58
      Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NET4.csproj
  33. 5 13
      Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.csproj
  34. 0 53
      Shaders/Tilemap/Aether.Shaders.Tilemap.NET4.csproj
  35. 4 9
      Shaders/Tilemap/Aether.Shaders.Tilemap.csproj
  36. 2 2
      Tilemap/Aether.Tilemap.NET4.csproj
  37. 1 1
      Tilemap/Aether.Tilemap.NETSTANDARD.csproj

+ 4 - 4
Aether.Extras.NET4.sln

@@ -23,17 +23,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.NET4.DX",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.FXAA.NET4", "Shaders\FXAA\Aether.Shaders.FXAA.NET4.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.FXAA", "Shaders\FXAA\Aether.Shaders.FXAA.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Deferred.NET4", "Shaders\Deferred\Aether.Shaders.Deferred.NET4.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Deferred", "Shaders\Deferred\Aether.Shaders.Deferred.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AtlasImporter", "Content.Pipeline\AtlasImporter\AtlasImporter.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Atlas.NET4", "Atlas\Aether.Atlas.NET4.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.InfiniteGrid.NET4", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NET4.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Tilemap.NET4", "Shaders\Tilemap\Aether.Shaders.Tilemap.NET4.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Tilemap", "Shaders\Tilemap\Aether.Shaders.Tilemap.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLMCImporter", "Content.Pipeline\SLMCImporter\SLMCImporter.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
 EndProject

+ 4 - 4
Aether.Extras.NETSTANDARD.sln

@@ -23,17 +23,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDAR
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.FXAA.NETSTANDARD", "Shaders\FXAA\Aether.Shaders.FXAA.NETSTANDARD.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.FXAA", "Shaders\FXAA\Aether.Shaders.FXAA.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred.NETSTANDARD", "Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred", "Shaders\Deferred\Aether.Shaders.Deferred.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AtlasImporter", "Content.Pipeline\AtlasImporter\AtlasImporter.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Atlas.NETSTANDARD", "Atlas\Aether.Atlas.NETSTANDARD.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid.NETSTANDARD", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap.NETSTANDARD", "Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap", "Shaders\Tilemap\Aether.Shaders.Tilemap.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SLMCImporter", "Content.Pipeline\SLMCImporter\SLMCImporter.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
 EndProject

+ 4 - 4
Samples.DESKTOPGL.NET8.sln

@@ -23,17 +23,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDAR
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.FXAA.NETSTANDARD", "Shaders\FXAA\Aether.Shaders.FXAA.NETSTANDARD.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.FXAA", "Shaders\FXAA\Aether.Shaders.FXAA.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred.NETSTANDARD", "Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred", "Shaders\Deferred\Aether.Shaders.Deferred.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap.NETSTANDARD", "Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap", "Shaders\Tilemap\Aether.Shaders.Tilemap.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AtlasImporter", "Content.Pipeline\AtlasImporter\AtlasImporter.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Atlas.NETSTANDARD", "Atlas\Aether.Atlas.NETSTANDARD.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid.NETSTANDARD", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{584E505E-859A-4DA8-9235-EE6C61C03479}"
 EndProject

+ 4 - 4
Samples.WINDOWS.NET8.sln

@@ -23,17 +23,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDAR
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.FXAA.NETSTANDARD", "Shaders\FXAA\Aether.Shaders.FXAA.NETSTANDARD.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.FXAA", "Shaders\FXAA\Aether.Shaders.FXAA.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred.NETSTANDARD", "Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred", "Shaders\Deferred\Aether.Shaders.Deferred.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap.NETSTANDARD", "Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap", "Shaders\Tilemap\Aether.Shaders.Tilemap.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AtlasImporter", "Content.Pipeline\AtlasImporter\AtlasImporter.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Atlas.NETSTANDARD", "Atlas\Aether.Atlas.NETSTANDARD.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid.NETSTANDARD", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{584E505E-859A-4DA8-9235-EE6C61C03479}"
 EndProject

+ 4 - 4
Samples.WINDOWS.sln

@@ -23,17 +23,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.NET4.DX",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.FXAA.NET4", "Shaders\FXAA\Aether.Shaders.FXAA.NET4.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.FXAA", "Shaders\FXAA\Aether.Shaders.FXAA.csproj", "{FBBDE2BA-F9F3-4041-8584-2C912C235E26}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Deferred.NET4", "Shaders\Deferred\Aether.Shaders.Deferred.NET4.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Deferred", "Shaders\Deferred\Aether.Shaders.Deferred.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Tilemap.NET4", "Shaders\Tilemap\Aether.Shaders.Tilemap.NET4.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Tilemap", "Shaders\Tilemap\Aether.Shaders.Tilemap.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AtlasImporter", "Content.Pipeline\AtlasImporter\AtlasImporter.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Atlas.NET4", "Atlas\Aether.Atlas.NET4.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.InfiniteGrid.NET4", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NET4.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{584E505E-859A-4DA8-9235-EE6C61C03479}"
 EndProject

+ 1 - 1
Samples/Animation.sln

@@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDAR
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics.NETSTANDARD", "..\Graphics\Aether.Graphics.NETSTANDARD.csproj", "{37BD292A-89C2-419F-9026-575BEFF2A3D9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid.NETSTANDARD", "..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj", "{E596EED9-95B1-49DB-852C-445C139A90CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid", "..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{E596EED9-95B1-49DB-852C-445C139A90CC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsImporters", "..\Content.Pipeline\GraphicsImporters\GraphicsImporters.csproj", "{D81FBBF9-4686-4C7D-9D64-6D92A6748CE0}"
 EndProject

+ 1 - 1
Samples/Animation/Animation.Android/Animation.Android.csproj

@@ -59,7 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Animation\Aether.Animation.NETSTANDARD.csproj" />
-    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj" />
   </ItemGroup>
   <Import Project="..\Animation.Shared\Animation.Shared.projitems" Label="Shared" />
 

+ 1 - 1
Samples/Animation/Animation.BlazorGL/Animation.BlazorGL.csproj

@@ -56,7 +56,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Animation\Aether.Animation.NETSTANDARD.csproj" />
-    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj" />
   </ItemGroup>
   <Import Project="..\Animation.Shared\Animation.Shared.projitems" Label="Shared" />
 

+ 1 - 1
Samples/Animation/Animation.DesktopGL/Animation.DesktopGL.csproj

@@ -57,7 +57,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Animation\Aether.Animation.NETSTANDARD.csproj" />
-    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj" />
   </ItemGroup>
   <Import Project="..\Animation.Shared\Animation.Shared.projitems" Label="Shared" />
 

+ 1 - 1
Samples/Animation/Animation.Shared/Samples.Animation.DESKTOPGL.NET8.csproj

@@ -54,7 +54,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Animation\Aether.Animation.NETSTANDARD.csproj" />
-    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj" />
   </ItemGroup>
 
 </Project>

+ 1 - 1
Samples/Animation/Animation.Shared/Samples.Animation.WINDOWS.NET8.csproj

@@ -55,7 +55,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Animation\Aether.Animation.NETSTANDARD.DX.csproj" />
-    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj" />
   </ItemGroup>
 
 </Project>

+ 2 - 2
Samples/Animation/Animation.Shared/Samples.Animation.WINDOWS.csproj

@@ -74,9 +74,9 @@
       <Project>{57903a6b-1576-4361-8f03-1d5f038a782a}</Project>
       <Name>Aether.Animation.NET4.DX</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NET4.csproj">
+    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj">
       <Project>{08296a2e-becf-4db9-a518-8a613d07b80e}</Project>
-      <Name>Aether.Shaders.InfiniteGrid.NET4</Name>
+      <Name>Aether.Shaders.InfiniteGrid</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+ 1 - 1
Samples/Animation/Animation.WindowsDX/Animation.WindowsDX.csproj

@@ -55,7 +55,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Animation\Aether.Animation.NETSTANDARD.csproj" />
-    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj" />
   </ItemGroup>
   <Import Project="..\Animation.Shared\Animation.Shared.projitems" Label="Shared" />
 

+ 1 - 1
Samples/Deferred.sln

@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Deferred.BlazorGL", "Deferr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{E0EC3ECF-86A0-4DB9-80FB-EABB5E3C3534}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred.NETSTANDARD", "..\Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj", "{4CDE0225-870D-4F11-B4C8-333DD42ED6DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred", "..\Shaders\Deferred\Aether.Shaders.Deferred.csproj", "{4CDE0225-870D-4F11-B4C8-333DD42ED6DB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+ 1 - 1
Samples/Deferred/Deferred.Android/Deferred.Android.csproj

@@ -58,7 +58,7 @@
     </KniContentReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.csproj" />
   </ItemGroup>
   <Import Project="..\Deferred.Shared\Deferred.Shared.projitems" Label="Shared" />
 

+ 1 - 1
Samples/Deferred/Deferred.BlazorGL/Deferred.BlazorGL.csproj

@@ -55,7 +55,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.csproj" />
   </ItemGroup>
   <Import Project="..\Deferred.Shared\Deferred.Shared.projitems" Label="Shared" />
 

+ 1 - 1
Samples/Deferred/Deferred.DesktopGL/Deferred.DesktopGL.csproj

@@ -56,7 +56,7 @@
     <None Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.csproj" />
   </ItemGroup>
   <Import Project="..\Deferred.Shared\Deferred.Shared.projitems" Label="Shared" />
 

+ 1 - 1
Samples/Deferred/Deferred.Shared/Samples.Deferred.DESKTOPGL.NET8.csproj

@@ -56,7 +56,7 @@
     </KniContentReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.csproj" />
   </ItemGroup>
 
 </Project>

+ 1 - 1
Samples/Deferred/Deferred.Shared/Samples.Deferred.WINDOWS.NET8.csproj

@@ -57,7 +57,7 @@
     </KniContentReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.csproj" />
   </ItemGroup>
 
 </Project>

+ 2 - 2
Samples/Deferred/Deferred.Shared/Samples.Deferred.WINDOWS.csproj

@@ -73,9 +73,9 @@
     <None Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.NET4.csproj">
+    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.csproj">
       <Project>{96105100-20db-4187-9bca-0a20ac9f1298}</Project>
-      <Name>Aether.Shaders.Deferred.NET4</Name>
+      <Name>Aether.Shaders.Deferred</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+ 1 - 1
Samples/Deferred/Deferred.WindowsDX/Deferred.WindowsDX.csproj

@@ -54,7 +54,7 @@
     <None Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\Deferred\Aether.Shaders.Deferred.csproj" />
   </ItemGroup>
   <Import Project="..\Deferred.Shared\Deferred.Shared.projitems" Label="Shared" />
 

+ 1 - 1
Samples/FXAA/FXAA.Shared/Samples.FXAA.DESKTOPGL.NET8.csproj

@@ -55,7 +55,7 @@
     </KniContentReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\FXAA\Aether.Shaders.FXAA.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\FXAA\Aether.Shaders.FXAA.csproj" />
   </ItemGroup>
 
 </Project>

+ 1 - 1
Samples/FXAA/FXAA.Shared/Samples.FXAA.WINDOWS.NET8.csproj

@@ -56,7 +56,7 @@
     </KniContentReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\FXAA\Aether.Shaders.FXAA.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\FXAA\Aether.Shaders.FXAA.csproj" />
   </ItemGroup>
 
 </Project>

+ 2 - 2
Samples/FXAA/FXAA.Shared/Samples.FXAA.WINDOWS.csproj

@@ -72,9 +72,9 @@
     <None Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Shaders\FXAA\Aether.Shaders.FXAA.NET4.csproj">
+    <ProjectReference Include="..\..\..\Shaders\FXAA\Aether.Shaders.FXAA.csproj">
       <Project>{fbbde2ba-f9f3-4041-8584-2c912c235e26}</Project>
-      <Name>Aether.Shaders.FXAA.NET4</Name>
+      <Name>Aether.Shaders.FXAA</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+ 1 - 1
Samples/Tilemap/Tilemap.Shared/Samples.Tilemaps.DESKTOPGL.NET8.csproj

@@ -54,7 +54,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Atlas\Aether.Atlas.NETSTANDARD.csproj" />
-    <ProjectReference Include="..\..\..\Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\Tilemap\Aether.Shaders.Tilemap.csproj" />
     <ProjectReference Include="..\..\..\Tilemap\Aether.Tilemap.NETSTANDARD.csproj" />
   </ItemGroup>
 

+ 1 - 1
Samples/Tilemap/Tilemap.Shared/Samples.Tilemaps.WINDOWS.NET8.csproj

@@ -55,7 +55,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Atlas\Aether.Atlas.NETSTANDARD.csproj" />
-    <ProjectReference Include="..\..\..\Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\..\..\Shaders\Tilemap\Aether.Shaders.Tilemap.csproj" />
     <ProjectReference Include="..\..\..\Tilemap\Aether.Tilemap.NETSTANDARD.csproj" />
   </ItemGroup>
 

+ 2 - 2
Samples/Tilemap/Tilemap.Shared/Samples.Tilemaps.WINDOWS.csproj

@@ -74,9 +74,9 @@
       <Project>{c7522b5e-b255-4fb6-a17a-9e6d217aebd2}</Project>
       <Name>Aether.Atlas.NET4</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Shaders\Tilemap\Aether.Shaders.Tilemap.NET4.csproj">
+    <ProjectReference Include="..\..\..\Shaders\Tilemap\Aether.Shaders.Tilemap.csproj">
       <Project>{6721cd07-0880-4154-85af-ebe6043ef178}</Project>
-      <Name>Aether.Shaders.Tilemap.NET4</Name>
+      <Name>Aether.Shaders.Tilemap</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Tilemap\Aether.Tilemap.NET4.csproj">
       <Project>{7bd9f460-f3f9-40a0-b298-066ea975c06c}</Project>

+ 0 - 63
Shaders/Deferred/Aether.Shaders.Deferred.NET4.csproj

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{96105100-20DB-4187-9BCA-0A20AC9F1298}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Shaders</RootNamespace>
-    <AssemblyName>Aether.Shaders.Deferred</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Artifacts\Debug\Libraries\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Libraries\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DeferredBasicEffect.cs" />
-    <Compile Include="DeferredClearGBufferEffect.cs" />
-    <Compile Include="DeferredCombineEffect.cs" />
-    <Compile Include="DeferredPointLightEffect.cs" />
-    <Compile Include="DeferredSpotLightEffect.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\DeferredBasicEffect.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\DeferredClearGBuffer.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\DeferredCombine.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\DeferredPointLight.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\DeferredSpotLight.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\DeferredBasicEffect.ogl.fxo.10" />
-    <EmbeddedResource Include="Resources\DeferredClearGBuffer.ogl.fxo.10" />
-    <EmbeddedResource Include="Resources\DeferredCombine.ogl.fxo.10" />
-    <EmbeddedResource Include="Resources\DeferredPointLight.ogl.fxo.10" />
-    <EmbeddedResource Include="Resources\DeferredSpotLight.ogl.fxo.10" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

+ 4 - 9
Shaders/Deferred/Aether.Shaders.Deferred.NETSTANDARD.csproj → Shaders/Deferred/Aether.Shaders.Deferred.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{96105100-20DB-4187-9BCA-0A20AC9F1298}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Shaders</RootNamespace>
     <AssemblyName>Aether.Shaders.Deferred</AssemblyName>
@@ -17,14 +18,8 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DeferredBasicEffect.cs" />

+ 0 - 58
Shaders/FXAA/Aether.Shaders.FXAA.NET4.csproj

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{FBBDE2BA-F9F3-4041-8584-2C912C235E26}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Shaders</RootNamespace>
-    <AssemblyName>Aether.Shaders.FXAA</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Artifacts\Debug\Libraries\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Libraries\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FXAAEffect.cs" />
-    <Compile Include="FXAAGreenLumaHighEffect.cs" />
-    <Compile Include="FXAAGreenLumaLowEffect.cs" />
-    <Compile Include="FXAAGreenLumaMediumEffect.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaHigh.ogl.fxo.10" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaLow.ogl.fxo.10" />
-    <EmbeddedResource Include="Resources\FXAAGreenLumaMedium.ogl.fxo.10" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

+ 4 - 9
Shaders/FXAA/Aether.Shaders.FXAA.NETSTANDARD.csproj → Shaders/FXAA/Aether.Shaders.FXAA.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{FBBDE2BA-F9F3-4041-8584-2C912C235E26}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Shaders</RootNamespace>
     <AssemblyName>Aether.Shaders.FXAA</AssemblyName>
@@ -17,14 +18,8 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FXAAEffect.cs" />

+ 0 - 58
Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NET4.csproj

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{08296A2E-BECF-4DB9-A518-8A613D07B80E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Shaders</RootNamespace>
-    <AssemblyName>Aether.Shaders.InfiniteGrid</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Artifacts\Debug\Libraries\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Libraries\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Game" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Components\InfiniteGridComponent.cs" />
-    <Compile Include="InfiniteGridEffect.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.HiDef.ogl.fxo.10" />
-    <EmbeddedResource Include="Resources\InfiniteGridEffect.Reach.ogl.fxo.10" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

+ 5 - 13
Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj → Shaders/InfiniteGrid/Aether.Shaders.InfiniteGrid.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{08296A2E-BECF-4DB9-A518-8A613D07B80E}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Shaders</RootNamespace>
     <AssemblyName>Aether.Shaders.InfiniteGrid</AssemblyName>
@@ -17,18 +18,9 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Game" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Game" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Components\InfiniteGridComponent.cs" />

+ 0 - 53
Shaders/Tilemap/Aether.Shaders.Tilemap.NET4.csproj

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{6721CD07-0880-4154-85AF-EBE6043EF178}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Shaders</RootNamespace>
-    <AssemblyName>Aether.Shaders.Tilemap</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Artifacts\Debug\Libraries\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Libraries\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TilemapEffect.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\TilemapEffect.dx11.fxo.10" />
-    <EmbeddedResource Include="Resources\TilemapEffect.ogl.fxo.10" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

+ 4 - 9
Shaders/Tilemap/Aether.Shaders.Tilemap.NETSTANDARD.csproj → Shaders/Tilemap/Aether.Shaders.Tilemap.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{6721CD07-0880-4154-85AF-EBE6043EF178}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Shaders</RootNamespace>
     <AssemblyName>Aether.Shaders.Tilemap</AssemblyName>
@@ -27,13 +28,7 @@
     <EmbeddedResource Include="Resources\TilemapEffect.ogl.fxo.10" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
   </ItemGroup>
 </Project>

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

@@ -57,9 +57,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Shaders\Tilemap\Aether.Shaders.Tilemap.NET4.csproj">
+    <ProjectReference Include="..\Shaders\Tilemap\Aether.Shaders.Tilemap.csproj">
       <Project>{6721cd07-0880-4154-85af-ebe6043ef178}</Project>
-      <Name>Aether.Shaders.Tilemap.NET4</Name>
+      <Name>Aether.Shaders.Tilemap</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

+ 1 - 1
Tilemap/Aether.Tilemap.NETSTANDARD.csproj

@@ -39,6 +39,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj" />
+    <ProjectReference Include="..\Shaders\Tilemap\Aether.Shaders.Tilemap.csproj" />
   </ItemGroup>
 </Project>