merge Tilemap project

Aether.Extras.NET4.sln

@@ -39,7 +39,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SLMCImporter", "Content.Pip
 EndProject
 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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Tilemap", "Tilemap\Aether.Tilemap.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Aether.Extras.NETSTANDARD.sln

@@ -39,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SLMCImporter", "Content.Pip
 EndProject
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Tilemap", "Tilemap\Aether.Tilemap.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Samples.DESKTOPGL.NET8.sln

@@ -57,7 +57,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.SLMC.DESKTOPGL.NET8
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Tilemaps.DESKTOPGL.NET8", "Samples\Tilemap\Tilemap.Shared\Samples.Tilemaps.DESKTOPGL.NET8.csproj", "{9B99798B-72F3-4E4B-9B99-DE15F7C955E9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Tilemap.NETSTANDARD", "Tilemap\Aether.Tilemap.NETSTANDARD.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Tilemap", "Tilemap\Aether.Tilemap.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Samples.WINDOWS.NET8.sln

@@ -57,7 +57,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.SLMC.WINDOWS.NET8",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Tilemaps.WINDOWS.NET8", "Samples\Tilemap\Tilemap.Shared\Samples.Tilemaps.WINDOWS.NET8.csproj", "{9B99798B-72F3-4E4B-9B99-DE15F7C955E9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Tilemap.NETSTANDARD", "Tilemap\Aether.Tilemap.NETSTANDARD.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Tilemap", "Tilemap\Aether.Tilemap.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Samples.WINDOWS.sln

@@ -57,7 +57,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.SLMC.WINDOWS", "Sam
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Tilemaps.WINDOWS", "Samples\Tilemap\Tilemap.Shared\Samples.Tilemaps.WINDOWS.csproj", "{9B99798B-72F3-4E4B-9B99-DE15F7C955E9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Tilemap.NET4", "Tilemap\Aether.Tilemap.NET4.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Tilemap", "Tilemap\Aether.Tilemap.csproj", "{7BD9F460-F3F9-40A0-B298-066EA975C06C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Samples/Tilemap/Tilemap.Shared/Samples.Tilemaps.DESKTOPGL.NET8.csproj

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

Samples/Tilemap/Tilemap.Shared/Samples.Tilemaps.WINDOWS.NET8.csproj

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

Samples/Tilemap/Tilemap.Shared/Samples.Tilemaps.WINDOWS.csproj

@@ -78,9 +78,9 @@
       <Project>{6721cd07-0880-4154-85af-ebe6043ef178}</Project>
       <Name>Aether.Shaders.Tilemap</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Tilemap\Aether.Tilemap.NET4.csproj">
+    <ProjectReference Include="..\..\..\Tilemap\Aether.Tilemap.csproj">
       <Project>{7bd9f460-f3f9-40a0-b298-066ea975c06c}</Project>
-      <Name>Aether.Tilemap.NET4</Name>
+      <Name>Aether.Tilemap</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

Tilemap/Aether.Tilemap.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>{7BD9F460-F3F9-40A0-B298-066EA975C06C}</ProjectGuid>
-    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Graphics</RootNamespace>
-    <AssemblyName>Aether.Tilemap</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </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>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </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>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </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" />
-    <Reference Include="System.Core" />
-    <Reference Include="mscorlib" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Tilemap\Extensions.cs" />
-    <Compile Include="Tilemap\Tile.cs" />
-    <Compile Include="Tilemap\Tilemap.cs" />
-    <Compile Include="ContentReaders\TilemapReader.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Shaders\Tilemap\Aether.Shaders.Tilemap.csproj">
-      <Project>{6721cd07-0880-4154-85af-ebe6043ef178}</Project>
-      <Name>Aether.Shaders.Tilemap</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Tilemap/Aether.Tilemap.NETSTANDARD.csproj → Tilemap/Aether.Tilemap.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{7BD9F460-F3F9-40A0-B298-066EA975C06C}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Graphics</RootNamespace>
     <AssemblyName>Aether.Tilemap</AssemblyName>
@@ -18,18 +19,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="Tilemap\Extensions.cs" />