merge Graphics project

Aether.Extras.NET4.sln

@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RawModelProcessor", "Conten
 EndProject
 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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Graphics", "Graphics\Aether.Graphics.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject

Aether.Extras.NETSTANDARD.sln

@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawModelProcessor", "Conten
 EndProject
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics", "Graphics\Aether.Graphics.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject

Graphics/Aether.Graphics.NET4.csproj

@@ -1,55 +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>{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Graphics</RootNamespace>
-    <AssemblyName>Aether.Graphics</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\Libraries\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\Libraries\net4\</OutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </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>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ContentReaders\DynamicIndexBufferReader.cs" />
-    <Compile Include="ContentReaders\DynamicVertexBufferReader.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Graphics/Aether.Graphics.NETSTANDARD.csproj → Graphics/Aether.Graphics.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Graphics</RootNamespace>
     <AssemblyName>Aether.Graphics</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.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" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ContentReaders\DynamicIndexBufferReader.cs" />

Samples.DESKTOPGL.NET8.sln

@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawModelProcessor", "Conten
 EndProject
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics", "Graphics\Aether.Graphics.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject

Samples.WINDOWS.NET8.sln

@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RawModelProcessor", "Conten
 EndProject
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics", "Graphics\Aether.Graphics.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject

Samples.WINDOWS.sln

@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RawModelProcessor", "Conten
 EndProject
 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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Graphics", "Graphics\Aether.Graphics.csproj", "{0A4ED2DF-9CDD-4C98-83AA-1898A394AC27}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationImporters", "Content.Pipeline\AnimationImporters\AnimationImporters.csproj", "{D9A47306-DEE0-4410-BC2C-BA8FFCE682A3}"
 EndProject

Samples/Animation.sln

@@ -21,7 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Sh
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD", "..\Animation\Aether.Animation.NETSTANDARD.csproj", "{56E77865-1779-4169-9836-8DE461CC21DD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics.NETSTANDARD", "..\Graphics\Aether.Graphics.NETSTANDARD.csproj", "{37BD292A-89C2-419F-9026-575BEFF2A3D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Graphics", "..\Graphics\Aether.Graphics.csproj", "{37BD292A-89C2-419F-9026-575BEFF2A3D9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid", "..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{E596EED9-95B1-49DB-852C-445C139A90CC}"
 EndProject