From 08f45bcfd4a333588b1378ae88885ec07c503311 Mon Sep 17 00:00:00 2001
From: Recrown <yunyangdeng@gmail.com>
Date: Sat, 1 Jun 2019 15:36:31 -0500
Subject: [PATCH] Moved the ScreenSystem to under UI namespace.

---
 .../RecrownedAthenaeum.Pipeline.csproj                      | 6 +++---
 RecrownedAthenaeum.Pipeline/packages.config                 | 6 ------
 RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj    | 4 ++--
 RecrownedAthenaeum/RecrownedAthenaeum.csproj                | 4 ++--
 RecrownedAthenaeum/{ => UI}/ScreenSystem/ITransition.cs     | 2 +-
 RecrownedAthenaeum/{ => UI}/ScreenSystem/LoadingScreen.cs   | 2 +-
 RecrownedAthenaeum/{ => UI}/ScreenSystem/Screen.cs          | 2 +-
 RecrownedAthenaeum/{ => UI}/ScreenSystem/ScreenManager.cs   | 2 +-
 8 files changed, 11 insertions(+), 17 deletions(-)
 delete mode 100644 RecrownedAthenaeum.Pipeline/packages.config
 rename RecrownedAthenaeum/{ => UI}/ScreenSystem/ITransition.cs (97%)
 rename RecrownedAthenaeum/{ => UI}/ScreenSystem/LoadingScreen.cs (99%)
 rename RecrownedAthenaeum/{ => UI}/ScreenSystem/Screen.cs (99%)
 rename RecrownedAthenaeum/{ => UI}/ScreenSystem/ScreenManager.cs (99%)

diff --git a/RecrownedAthenaeum.Pipeline/RecrownedAthenaeum.Pipeline.csproj b/RecrownedAthenaeum.Pipeline/RecrownedAthenaeum.Pipeline.csproj
index b1f79a6..d3ca789 100644
--- a/RecrownedAthenaeum.Pipeline/RecrownedAthenaeum.Pipeline.csproj
+++ b/RecrownedAthenaeum.Pipeline/RecrownedAthenaeum.Pipeline.csproj
@@ -3,10 +3,10 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable" Version="3.7.1.189" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" PrivateAssets="All"/>
+    <PackageReference Include="MonoGame.Framework.Content.Pipeline.Portable" Version="3.7.1.189" PrivateAssets="All"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\RecrownedAthenaeum\RecrownedAthenaeum.csproj" />
+    <ProjectReference Include="..\RecrownedAthenaeum\RecrownedAthenaeum.csproj" PrivateAssets="All"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/RecrownedAthenaeum.Pipeline/packages.config b/RecrownedAthenaeum.Pipeline/packages.config
deleted file mode 100644
index a03f32b..0000000
--- a/RecrownedAthenaeum.Pipeline/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="MonoGame.Framework.Content.Pipeline.Portable" version="3.7.1.189" targetFramework="net45" />
-  <package id="MonoGame.Framework.Portable" version="3.7.1.189" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj b/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj
index 4bbfc11..567187c 100644
--- a/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj
+++ b/RecrownedAthenaeum.Tools/RecrownedAthenaeum.Tools.csproj
@@ -14,13 +14,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" PrivateAssets="All"/>
     <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0005" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0005" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\RecrownedAthenaeum\RecrownedAthenaeum.csproj" />
+    <ProjectReference Include="..\RecrownedAthenaeum\RecrownedAthenaeum.csproj" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/RecrownedAthenaeum/RecrownedAthenaeum.csproj b/RecrownedAthenaeum/RecrownedAthenaeum.csproj
index 3d495ee..362d139 100644
--- a/RecrownedAthenaeum/RecrownedAthenaeum.csproj
+++ b/RecrownedAthenaeum/RecrownedAthenaeum.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2"/>
-    <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189"/>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" PrivateAssets="All"/>
+    <PackageReference Include="MonoGame.Framework.Portable" Version="3.6.0.1625" PrivateAssets="All"/>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/RecrownedAthenaeum/ScreenSystem/ITransition.cs b/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs
similarity index 97%
rename from RecrownedAthenaeum/ScreenSystem/ITransition.cs
rename to RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs
index a8ce45d..e76768c 100644
--- a/RecrownedAthenaeum/ScreenSystem/ITransition.cs
+++ b/RecrownedAthenaeum/UI/ScreenSystem/ITransition.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.Render;
 
-namespace RecrownedAthenaeum.ScreenSystem
+namespace RecrownedAthenaeum.UI.ScreenSystem
 {
     /// <summary>
     /// Contracts a transition that the <see cref="ScreenManager"/> can use.
diff --git a/RecrownedAthenaeum/ScreenSystem/LoadingScreen.cs b/RecrownedAthenaeum/UI/ScreenSystem/LoadingScreen.cs
similarity index 99%
rename from RecrownedAthenaeum/ScreenSystem/LoadingScreen.cs
rename to RecrownedAthenaeum/UI/ScreenSystem/LoadingScreen.cs
index d166685..8f3597f 100644
--- a/RecrownedAthenaeum/ScreenSystem/LoadingScreen.cs
+++ b/RecrownedAthenaeum/UI/ScreenSystem/LoadingScreen.cs
@@ -4,7 +4,7 @@ using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.Render;
 using System;
 
-namespace RecrownedAthenaeum.ScreenSystem
+namespace RecrownedAthenaeum.UI.ScreenSystem
 {
     /// <summary>
     /// A screen specifically meant to fill in loading times.
diff --git a/RecrownedAthenaeum/ScreenSystem/Screen.cs b/RecrownedAthenaeum/UI/ScreenSystem/Screen.cs
similarity index 99%
rename from RecrownedAthenaeum/ScreenSystem/Screen.cs
rename to RecrownedAthenaeum/UI/ScreenSystem/Screen.cs
index 724d6c3..0e941b2 100644
--- a/RecrownedAthenaeum/ScreenSystem/Screen.cs
+++ b/RecrownedAthenaeum/UI/ScreenSystem/Screen.cs
@@ -3,7 +3,7 @@ using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.Render;
 using System.Collections.Generic;
 
-namespace RecrownedAthenaeum.ScreenSystem
+namespace RecrownedAthenaeum.UI.ScreenSystem
 {
     /// <summary>
     /// Represents one of the poosible states a screen can be in.
diff --git a/RecrownedAthenaeum/ScreenSystem/ScreenManager.cs b/RecrownedAthenaeum/UI/ScreenSystem/ScreenManager.cs
similarity index 99%
rename from RecrownedAthenaeum/ScreenSystem/ScreenManager.cs
rename to RecrownedAthenaeum/UI/ScreenSystem/ScreenManager.cs
index 415342a..260deef 100644
--- a/RecrownedAthenaeum/ScreenSystem/ScreenManager.cs
+++ b/RecrownedAthenaeum/UI/ScreenSystem/ScreenManager.cs
@@ -4,7 +4,7 @@ using RecrownedAthenaeum.Render;
 using System;
 using System.Diagnostics;
 
-namespace RecrownedAthenaeum.ScreenSystem
+namespace RecrownedAthenaeum.UI.ScreenSystem
 {
     /// <summary>
     /// Called when the first screen is being shown.