merge Atlas project

Aether.Extras.NET4.sln

@@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Deferred", "
 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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Atlas", "Atlas\Aether.Atlas.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject

Aether.Extras.NETSTANDARD.sln

@@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Deferred", "
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Atlas", "Atlas\Aether.Atlas.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject

Atlas/Aether.Atlas.NET4.csproj

@@ -1,61 +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>{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}</ProjectGuid>
-    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Graphics</RootNamespace>
-    <AssemblyName>Aether.Atlas</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="Atlas\Extensions.cs" />
-    <Compile Include="Atlas\Sprite.cs" />
-    <Compile Include="Atlas\TextureAtlas.cs" />
-    <Compile Include="ContentReaders\TextureAtlasReader.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

Atlas/Aether.Atlas.NETSTANDARD.csproj → Atlas/Aether.Atlas.csproj

@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
+    <ProjectGuid>{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Graphics</RootNamespace>
     <AssemblyName>Aether.Atlas</AssemblyName>
@@ -18,18 +20,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="Atlas\Extensions.cs" />
@@ -40,4 +33,5 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+
 </Project>

Samples.DESKTOPGL.NET8.sln

@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap", "S
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Atlas", "Atlas\Aether.Atlas.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject

Samples.WINDOWS.NET8.sln

@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.Tilemap", "S
 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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Atlas", "Atlas\Aether.Atlas.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject

Samples.WINDOWS.sln

@@ -31,7 +31,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.Tilemap", "S
 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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Atlas", "Atlas\Aether.Atlas.csproj", "{C7522B5E-B255-4FB6-A17A-9E6D217AEBD2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Shaders.InfiniteGrid", "Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj", "{08296A2E-BECF-4DB9-A518-8A613D07B80E}"
 EndProject

Samples/Atlas/Atlas.Shared/Samples.Atlas.DESKTOPGL.NET8.csproj

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

Samples/Atlas/Atlas.Shared/Samples.Atlas.WINDOWS.NET8.csproj

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

Samples/Atlas/Atlas.Shared/Samples.Atlas.WINDOWS.csproj

@@ -70,9 +70,9 @@
     <None Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Atlas\Aether.Atlas.NET4.csproj">
+    <ProjectReference Include="..\..\..\Atlas\Aether.Atlas.csproj">
       <Project>{c7522b5e-b255-4fb6-a17a-9e6d217aebd2}</Project>
-      <Name>Aether.Atlas.NET4</Name>
+      <Name>Aether.Atlas</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

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

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

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

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

@@ -70,9 +70,9 @@
     <None Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Atlas\Aether.Atlas.NET4.csproj">
+    <ProjectReference Include="..\..\..\Atlas\Aether.Atlas.csproj">
       <Project>{c7522b5e-b255-4fb6-a17a-9e6d217aebd2}</Project>
-      <Name>Aether.Atlas.NET4</Name>
+      <Name>Aether.Atlas</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Shaders\Tilemap\Aether.Shaders.Tilemap.csproj">
       <Project>{6721cd07-0880-4154-85af-ebe6043ef178}</Project>