merge pipeline projects

Aether.Extras.NET4.sln

@@ -5,17 +5,17 @@ VisualStudioVersion = 16.0.32126.315
 MinimumVisualStudioVersion = 15.0.28307.1082
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Content.Pipeline", "Aether.Content.Pipeline", "{A921886B-C6F7-4FF8-8668-EC20004C464A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DDSImporter.NET4", "Content.Pipeline\DDSImporter\DDSImporter.NET4.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DDSImporter", "Content.Pipeline\DDSImporter\DDSImporter.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RawModelProcessor.NET4", "Content.Pipeline\RawModelProcessor\RawModelProcessor.NET4.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RawModelProcessor", "Content.Pipeline\RawModelProcessor\RawModelProcessor.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphicsImporters.NET4", "Content.Pipeline\GraphicsImporters\GraphicsImporters.NET4.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphicsImporters", "Content.Pipeline\GraphicsImporters\GraphicsImporters.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Graphics.NET4", "Graphics\Aether.Graphics.NET4.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationImporters.NET4", "Content.Pipeline\AnimationImporters\AnimationImporters.NET4.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TilemapImporter.NET4", "Content.Pipeline\TilemapImporters\TilemapImporter.NET4.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.NET4", "Animation\Aether.Animation.NET4.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
@@ -27,7 +27,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.FXAA.NET4",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Deferred.NET4", "Shaders\Deferred\Aether.Shaders.Deferred.NET4.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AtlasImporter.NET4", "Content.Pipeline\AtlasImporter\AtlasImporter.NET4.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
+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
@@ -35,9 +35,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.InfiniteGrid
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Tilemap.NET4", "Shaders\Tilemap\Aether.Shaders.Tilemap.NET4.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLMCImporter.NET4", "Content.Pipeline\SLMCImporter\SLMCImporter.NET4.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLMCImporter", "Content.Pipeline\SLMCImporter\SLMCImporter.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoxelImporters.NET4", "Content.Pipeline\VoxelImporters\VoxelImporters.NET4.csproj", "{AA15CF95-0AF2-4346-9465-CB6EDBE22ED9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VoxelImporters", "Content.Pipeline\VoxelImporters\VoxelImporters.csproj", "{AA15CF95-0AF2-4346-9465-CB6EDBE22ED9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Tilemap.NET4", "Tilemap\Aether.Tilemap.NET4.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
 EndProject

Aether.Extras.NETSTANDARD.sln

@@ -5,17 +5,17 @@ VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 15.0.28307.1082
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Content.Pipeline", "Aether.Content.Pipeline", "{A921886B-C6F7-4FF8-8668-EC20004C464A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDSImporter.NETSTANDARD", "Content.Pipeline\DDSImporter\DDSImporter.NETSTANDARD.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDSImporter", "Content.Pipeline\DDSImporter\DDSImporter.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawModelProcessor.NETSTANDARD", "Content.Pipeline\RawModelProcessor\RawModelProcessor.NETSTANDARD.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawModelProcessor", "Content.Pipeline\RawModelProcessor\RawModelProcessor.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsImporters.NETSTANDARD", "Content.Pipeline\GraphicsImporters\GraphicsImporters.NETSTANDARD.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsImporters", "Content.Pipeline\GraphicsImporters\GraphicsImporters.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics.NETSTANDARD", "Graphics\Aether.Graphics.NETSTANDARD.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters.NETSTANDARD", "Content.Pipeline\AnimationImporters\AnimationImporters.NETSTANDARD.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TilemapImporter.NETSTANDARD", "Content.Pipeline\TilemapImporters\TilemapImporter.NETSTANDARD.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD", "Animation\Aether.Animation.NETSTANDARD.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.FXAA.NETSTAN
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred.NETSTANDARD", "Shaders\Deferred\Aether.Shaders.Deferred.NETSTANDARD.csproj", "{96105100-20DB-4187-9BCA-0A20AC9F1298}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AtlasImporter.NETSTANDARD", "Content.Pipeline\AtlasImporter\AtlasImporter.NETSTANDARD.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
+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
@@ -35,9 +35,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap.NETSTANDARD", "Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SLMCImporter.NETSTANDARD", "Content.Pipeline\SLMCImporter\SLMCImporter.NETSTANDARD.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SLMCImporter", "Content.Pipeline\SLMCImporter\SLMCImporter.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoxelImporters.NETSTANDARD", "Content.Pipeline\VoxelImporters\VoxelImporters.NETSTANDARD.csproj", "{AA15CF95-0AF2-4346-9465-CB6EDBE22ED9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoxelImporters", "Content.Pipeline\VoxelImporters\VoxelImporters.csproj", "{AA15CF95-0AF2-4346-9465-CB6EDBE22ED9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Tilemap.NETSTANDARD", "Tilemap\Aether.Tilemap.NETSTANDARD.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
 EndProject

Content.Pipeline/AnimationImporters/AnimationImporters.NET4.csproj

@@ -1,80 +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>{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
-    <AssemblyName>Aether.Content.Pipeline.AnimationImporters</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\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Animation\AnimationsContent.cs" />
-    <Compile Include="Animation\ClipContent.cs" />
-    <Compile Include="Animation\CpuAnimatedVertexBufferContent.cs" />
-    <Compile Include="Animation\KeyframeContent.cs" />
-    <Compile Include="Processors\AnimationsProcessor.cs" />
-    <Compile Include="Processors\CpuAnimatedModelProcessor.cs" />
-    <Compile Include="Processors\GpuAnimatedModelProcessor.cs" />
-    <Compile Include="Serialization\AnimationsWriter.cs" />
-    <Compile Include="Serialization\ClipWriter.cs" />
-    <Compile Include="Serialization\CpuAnimatedVertexBufferWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.MG.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\GraphicsImporters\GraphicsImporters.NET4.csproj">
-      <Project>{400dc7b2-739d-4156-916d-2f2e1920310d}</Project>
-      <Name>GraphicsImporters.NET4</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Content.Pipeline/AnimationImporters/AnimationImporters.NETSTANDARD.csproj → Content.Pipeline/AnimationImporters/AnimationImporters.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
     <AssemblyName>Aether.Content.Pipeline.AnimationImporters</AssemblyName>
@@ -16,9 +17,6 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Animation\AnimationsContent.cs" />
     <Compile Include="Animation\ClipContent.cs" />
@@ -35,29 +33,14 @@
     <Compile Include="Properties\AssemblyInfo.MG.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.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.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GraphicsImporters\GraphicsImporters.NETSTANDARD.csproj">
+    <ProjectReference Include="..\GraphicsImporters\GraphicsImporters.csproj">
     </ProjectReference>
   </ItemGroup>
 </Project>

Content.Pipeline/AtlasImporter/AtlasImporter.NET4.csproj

@@ -1,68 +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>{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
-    <AssemblyName>Aether.Content.Pipeline.AtlasImporter</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\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.XML" />
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AtlasImporter.cs" />
-    <Compile Include="Atlas\TextureAtlasContent.cs" />
-    <Compile Include="Atlas\SpriteContent.cs" />
-    <Compile Include="Atlas\TileContent.cs" />
-    <Compile Include="Atlas\TilesetContent.cs" />
-    <Compile Include="Processors\TextureAtlasProcessor.cs" />
-    <Compile Include="Serialization\TextureAtlasWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Content.Pipeline/AtlasImporter/AtlasImporter.NETSTANDARD.csproj → Content.Pipeline/AtlasImporter/AtlasImporter.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
     <AssemblyName>Aether.Content.Pipeline.AtlasImporter</AssemblyName>
@@ -18,26 +19,11 @@
     <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.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.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.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AtlasImporter.cs" />

Content.Pipeline/DDSImporter/DDSImporter.NET4.csproj

@@ -1,65 +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>{26C387C6-7313-47D4-A05F-14639AB02D70}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
-    <AssemblyName>Aether.Content.Pipeline.DDSImporter</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\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </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.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DDSHeader.cs" />
-    <Compile Include="DDSImporter.cs" />
-    <Compile Include="DDSPixelFormat.cs" />
-    <Compile Include="DDSProcessor.cs" />
-    <Compile Include="DXT1Block.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Content.Pipeline/DDSImporter/DDSImporter.NETSTANDARD.csproj → Content.Pipeline/DDSImporter/DDSImporter.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{26C387C6-7313-47D4-A05F-14639AB02D70}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
     <AssemblyName>Aether.Content.Pipeline.DDSImporter</AssemblyName>
@@ -18,26 +19,11 @@
     <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.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.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.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DDSHeader.cs" />

Content.Pipeline/GraphicsImporters/GraphicsImporters.NET4.csproj

@@ -1,70 +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>{400DC7B2-739D-4156-916D-2F2E1920310D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
-    <AssemblyName>Aether.Content.Pipeline.GraphicsImporters</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\Artifacts\Debug\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Graphics\DynamicIndexBufferContent.cs" />
-    <Compile Include="Graphics\DynamicModelContent.cs" />
-    <Compile Include="Graphics\DynamicModelMeshContent.cs" />
-    <Compile Include="Graphics\DynamicModelMeshPartContent.cs" />
-    <Compile Include="Graphics\DynamicVertexBufferContent.cs" />
-    <Compile Include="Processors\DynamicModelProcessor.cs" />
-    <Compile Include="Serialization\DynamicIndexBufferWriter.cs" />
-    <Compile Include="Serialization\DynamicModelWriter.cs" />
-    <Compile Include="Serialization\DynamicVertexBufferWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Content.Pipeline/GraphicsImporters/GraphicsImporters.NETSTANDARD.csproj → Content.Pipeline/GraphicsImporters/GraphicsImporters.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{400DC7B2-739D-4156-916D-2F2E1920310D}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
     <AssemblyName>Aether.Content.Pipeline.GraphicsImporters</AssemblyName>
@@ -17,26 +18,11 @@
     <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.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.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.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Graphics\DynamicIndexBufferContent.cs" />

Content.Pipeline/RawModelProcessor/RawModelProcessor.NET4.csproj

@@ -1,59 +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>{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
-    <AssemblyName>Aether.Content.Pipeline.RawModelProcessor</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\Processors\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\Processors\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.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="RawModelProcessor.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Content.Pipeline/RawModelProcessor/RawModelProcessor.NETSTANDARD.csproj → Content.Pipeline/RawModelProcessor/RawModelProcessor.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
     <AssemblyName>Aether.Content.Pipeline.RawModelProcessor</AssemblyName>
@@ -17,26 +18,11 @@
     <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.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.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.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="RawModelProcessor.cs" />

Content.Pipeline/SLMCImporter/SLMCImporter.NET4.csproj

@@ -1,64 +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>{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
-    <AssemblyName>Aether.Content.Pipeline.SLMCImporter</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\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Processors\SLMCProcessor.cs" />
-    <Compile Include="Processors\SLMCOutputFormat.cs" />
-    <Compile Include="SLMCImporter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Content.Pipeline/SLMCImporter/SLMCImporter.NETSTANDARD.csproj → Content.Pipeline/SLMCImporter/SLMCImporter.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
     <AssemblyName>Aether.Content.Pipeline.SLMCImporter</AssemblyName>
@@ -18,26 +19,11 @@
     <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.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.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.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Processors\SLMCProcessor.cs" />

Content.Pipeline/TilemapImporters/TilemapImporter.NET4.csproj

@@ -1,69 +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>{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
-    <AssemblyName>Aether.Content.Pipeline.TilemapImporter</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\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.XML" />
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TilemapImporter.cs" />
-    <Compile Include="Tilemap\TileContent.cs" />
-    <Compile Include="Tilemap\TilemapContent.cs" />
-    <Compile Include="Tilemap\TilesetContent.cs" />
-    <Compile Include="Tilemap\XMLExtensions.cs" />
-    <Compile Include="Processors\TilePacker.cs" />
-    <Compile Include="Processors\TilemapProcessor.cs" />
-    <Compile Include="Serialization\TilemapWriter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Content.Pipeline/TilemapImporters/TilemapImporter.NET4.csproj.user

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <StartArguments>
-    </StartArguments>
-    <StartAction>Project</StartAction>
-    <StartProgram>
-    </StartProgram>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartAction>Program</StartAction>
-    <StartProgram>C:\Program Files %28x86%29\MSBuild\MonoGame\v3.0\Tools\MGCB.exe</StartProgram>
-    <StartArguments>/reference:..\..\Artifacts\Debug\Processors\net4\Aether.Content.Pipeline.TilemapImporter.dll /importer:TilemapImporter /processor:TilemapProcessor /build:tilemapNoMipmap.tmx</StartArguments>
-    <StartWorkingDirectory>P:\nkast\Aether.Extras\Samples\TilemapContent</StartWorkingDirectory>
-  </PropertyGroup>
-</Project>

Content.Pipeline/TilemapImporters/TilemapImporter.NETSTANDARD.csproj → Content.Pipeline/TilemapImporters/TilemapImporter.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
     <AssemblyName>Aether.Content.Pipeline.TilemapImporter</AssemblyName>
@@ -18,26 +19,11 @@
     <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.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.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.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="TilemapImporter.cs" />

Content.Pipeline/VoxelImporters/VoxelImporters.NET4.csproj

@@ -1,67 +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>{AA15CF95-0AF2-4346-9465-CB6EDBE22ED9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
-    <AssemblyName>Aether.Content.Pipeline.VoxelImporters</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\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\Artifacts\Release\Processors\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Vox\VoxImporter.cs" />
-    <Compile Include="Vox\VoxHeader.cs" />
-    <Compile Include="VertexPositionNormalColor.cs" />
-    <Compile Include="VoxelContent.cs" />
-    <Compile Include="VoxelModelImporter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Content.Pipeline/VoxelImporters/VoxelImporters.NETSTANDARD.csproj → Content.Pipeline/VoxelImporters/VoxelImporters.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{AA15CF95-0AF2-4346-9465-CB6EDBE22ED9}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Content.Pipeline</RootNamespace>
     <AssemblyName>Aether.Content.Pipeline.VoxelImporters</AssemblyName>
@@ -17,9 +18,6 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Vox\VoxImporter.cs" />
     <Compile Include="Vox\VoxHeader.cs" />
@@ -31,25 +29,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" 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.Content.Pipeline" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.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.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content.Pipeline.Graphics" Version="4.0.9001" />
   </ItemGroup>
 </Project>

Samples.DESKTOPGL.NET8.sln

@@ -5,17 +5,17 @@ VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 15.0.28307.1082
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Content.Pipeline", "Aether.Content.Pipeline", "{A921886B-C6F7-4FF8-8668-EC20004C464A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDSImporter.NETSTANDARD", "Content.Pipeline\DDSImporter\DDSImporter.NETSTANDARD.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDSImporter", "Content.Pipeline\DDSImporter\DDSImporter.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawModelProcessor.NETSTANDARD", "Content.Pipeline\RawModelProcessor\RawModelProcessor.NETSTANDARD.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawModelProcessor", "Content.Pipeline\RawModelProcessor\RawModelProcessor.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsImporters.NETSTANDARD", "Content.Pipeline\GraphicsImporters\GraphicsImporters.NETSTANDARD.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsImporters", "Content.Pipeline\GraphicsImporters\GraphicsImporters.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics.NETSTANDARD", "Graphics\Aether.Graphics.NETSTANDARD.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters.NETSTANDARD", "Content.Pipeline\AnimationImporters\AnimationImporters.NETSTANDARD.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TilemapImporter.NETSTANDARD", "Content.Pipeline\TilemapImporters\TilemapImporter.NETSTANDARD.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD", "Animation\Aether.Animation.NETSTANDARD.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
@@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred.NET
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap.NETSTANDARD", "Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AtlasImporter.NETSTANDARD", "Content.Pipeline\AtlasImporter\AtlasImporter.NETSTANDARD.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
+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
@@ -48,7 +48,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Atlas.DESKTOPGL.NET
 		{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5} = {E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SLMCImporter.NETSTANDARD", "Content.Pipeline\SLMCImporter\SLMCImporter.NETSTANDARD.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SLMCImporter", "Content.Pipeline\SLMCImporter\SLMCImporter.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.SLMC.DESKTOPGL.NET8", "Samples\SLMC\SLMC.Shared\Samples.SLMC.DESKTOPGL.NET8.csproj", "{DC1BD888-3D11-4557-AC59-8271DC991ED1}"
 	ProjectSection(ProjectDependencies) = postProject

Samples.WINDOWS.NET8.sln

@@ -5,17 +5,17 @@ VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 15.0.28307.1082
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Content.Pipeline", "Aether.Content.Pipeline", "{A921886B-C6F7-4FF8-8668-EC20004C464A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDSImporter.NETSTANDARD", "Content.Pipeline\DDSImporter\DDSImporter.NETSTANDARD.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDSImporter", "Content.Pipeline\DDSImporter\DDSImporter.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawModelProcessor.NETSTANDARD", "Content.Pipeline\RawModelProcessor\RawModelProcessor.NETSTANDARD.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawModelProcessor", "Content.Pipeline\RawModelProcessor\RawModelProcessor.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsImporters.NETSTANDARD", "Content.Pipeline\GraphicsImporters\GraphicsImporters.NETSTANDARD.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsImporters", "Content.Pipeline\GraphicsImporters\GraphicsImporters.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics.NETSTANDARD", "Graphics\Aether.Graphics.NETSTANDARD.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters.NETSTANDARD", "Content.Pipeline\AnimationImporters\AnimationImporters.NETSTANDARD.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TilemapImporter.NETSTANDARD", "Content.Pipeline\TilemapImporters\TilemapImporter.NETSTANDARD.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD", "Animation\Aether.Animation.NETSTANDARD.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
@@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred.NET
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap.NETSTANDARD", "Shaders\Tilemap\Aether.Shaders.Tilemap.NETSTANDARD.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AtlasImporter.NETSTANDARD", "Content.Pipeline\AtlasImporter\AtlasImporter.NETSTANDARD.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
+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
@@ -48,7 +48,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Atlas.WINDOWS.NET8"
 		{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5} = {E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SLMCImporter.NETSTANDARD", "Content.Pipeline\SLMCImporter\SLMCImporter.NETSTANDARD.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SLMCImporter", "Content.Pipeline\SLMCImporter\SLMCImporter.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.SLMC.WINDOWS.NET8", "Samples\SLMC\SLMC.Shared\Samples.SLMC.WINDOWS.NET8.csproj", "{DC1BD888-3D11-4557-AC59-8271DC991ED1}"
 	ProjectSection(ProjectDependencies) = postProject

Samples.WINDOWS.sln

@@ -5,17 +5,17 @@ VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 15.0.28307.1082
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Content.Pipeline", "Aether.Content.Pipeline", "{A921886B-C6F7-4FF8-8668-EC20004C464A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DDSImporter.NET4", "Content.Pipeline\DDSImporter\DDSImporter.NET4.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DDSImporter", "Content.Pipeline\DDSImporter\DDSImporter.csproj", "{26C387C6-7313-47D4-A05F-14639AB02D70}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RawModelProcessor.NET4", "Content.Pipeline\RawModelProcessor\RawModelProcessor.NET4.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RawModelProcessor", "Content.Pipeline\RawModelProcessor\RawModelProcessor.csproj", "{48E4029A-115C-4DC2-AF3A-0AB94F36BFC0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphicsImporters.NET4", "Content.Pipeline\GraphicsImporters\GraphicsImporters.NET4.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphicsImporters", "Content.Pipeline\GraphicsImporters\GraphicsImporters.csproj", "{400DC7B2-739D-4156-916D-2F2E1920310D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Graphics.NET4", "Graphics\Aether.Graphics.NET4.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationImporters.NET4", "Content.Pipeline\AnimationImporters\AnimationImporters.NET4.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TilemapImporter.NET4", "Content.Pipeline\TilemapImporters\TilemapImporter.NET4.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.NET4", "Animation\Aether.Animation.NET4.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
@@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Deferred.NET
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Tilemap.NET4", "Shaders\Tilemap\Aether.Shaders.Tilemap.NET4.csproj", "{6721CD07-0880-4154-85AF-EBE6043EF178}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AtlasImporter.NET4", "Content.Pipeline\AtlasImporter\AtlasImporter.NET4.csproj", "{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}"
+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
@@ -48,7 +48,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Atlas.WINDOWS", "Sa
 		{E710FBEA-8C75-405D-B6B4-CFC82CB48FB5} = {E710FBEA-8C75-405D-B6B4-CFC82CB48FB5}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLMCImporter.NET4", "Content.Pipeline\SLMCImporter\SLMCImporter.NET4.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLMCImporter", "Content.Pipeline\SLMCImporter\SLMCImporter.csproj", "{C9FA924B-DA91-4641-8B7D-CBC09E5560AE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.SLMC.WINDOWS", "Samples\SLMC\SLMC.Shared\Samples.SLMC.WINDOWS.csproj", "{DC1BD888-3D11-4557-AC59-8271DC991ED1}"
 	ProjectSection(ProjectDependencies) = postProject

Samples/Animation.sln

@@ -25,9 +25,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics.NETSTANDARD
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid.NETSTANDARD", "..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.NETSTANDARD.csproj", "{E596EED9-95B1-49DB-852C-445C139A90CC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsImporters.NETSTANDARD", "..\Content.Pipeline\GraphicsImporters\GraphicsImporters.NETSTANDARD.csproj", "{D81FBBF9-4686-4C7D-9D64-6D92A6748CE0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsImporters", "..\Content.Pipeline\GraphicsImporters\GraphicsImporters.csproj", "{D81FBBF9-4686-4C7D-9D64-6D92A6748CE0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters.NETSTANDARD", "..\Content.Pipeline\AnimationImporters\AnimationImporters.NETSTANDARD.csproj", "{A9CC70CE-7361-462E-ABB5-D904F681D0BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "..\Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{A9CC70CE-7361-462E-ABB5-D904F681D0BE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution