From 374c55257fdef3f73133cf4b14257123ce9b2b9a Mon Sep 17 00:00:00 2001 From: Julian Silden Langlo Date: Sun, 7 Nov 2021 23:56:37 +0100 Subject: [PATCH] Rename projects and clean up files that should be ignored. --- .gitignore | 2 +- .vs/Maps/DesignTimeBuild/.dtbcache.v2 | Bin 102778 -> 0 bytes .vs/Maps/v17/.futdcache.v1 | Bin 477 -> 0 bytes .vs/Maps/v17/fileList.bin | Bin 125939 -> 0 bytes Maps.sln | 10 +++++----- .../Controllers/ParsingController.cs | 0 {TravellerAPI => Traveller.API}/Dockerfile | 0 {TravellerAPI => Traveller.API}/Program.cs | 2 +- .../Properties/launchSettings.json | 0 .../Traveller.API.csproj | 6 +++--- .../appsettings.Development.json | 0 .../appsettings.json | 0 .../Features/Constants.cs | 2 +- .../Features/Galaxy.cs | 2 +- .../Features/IWorldHolder.cs | 2 +- .../Features/Metadata.cs | 2 +- .../Features/Position.cs | 2 +- .../Features/Quadrant.cs | 2 +- .../Features/Sector.cs | 2 +- .../Features/SubSector.cs | 2 +- .../Features/World .cs | 2 +- .../Traveller.Core.csproj | 0 {TravellerCore => Traveller.Core}/Using.cs | 0 .../Util/Astronomy.cs | 4 ++-- .../IParser.cs | 2 +- .../JsonParser.cs | 2 +- .../Traveller.Parser.csproj | 2 +- Traveller.Parser/Using.cs | 1 + .../TextRenderer.cs | 0 .../Traveller.Renderer.csproj | 2 +- Traveller.Renderer/Using.cs | 1 + .../AstronomyTests.cs | 4 ++-- .../Traveller.Tests.Core.csproj | 2 +- TravellerParser/Using.cs | 1 - TravellerRenderer/Using.cs | 1 - 35 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 .vs/Maps/DesignTimeBuild/.dtbcache.v2 delete mode 100644 .vs/Maps/v17/.futdcache.v1 delete mode 100644 .vs/Maps/v17/fileList.bin rename {TravellerAPI => Traveller.API}/Controllers/ParsingController.cs (100%) rename {TravellerAPI => Traveller.API}/Dockerfile (100%) rename {TravellerAPI => Traveller.API}/Program.cs (96%) rename {TravellerAPI => Traveller.API}/Properties/launchSettings.json (100%) rename TravellerAPI/TravellerAPI.csproj => Traveller.API/Traveller.API.csproj (71%) rename {TravellerAPI => Traveller.API}/appsettings.Development.json (100%) rename {TravellerAPI => Traveller.API}/appsettings.json (100%) rename {TravellerCore => Traveller.Core}/Features/Constants.cs (98%) rename {TravellerCore => Traveller.Core}/Features/Galaxy.cs (86%) rename {TravellerCore => Traveller.Core}/Features/IWorldHolder.cs (81%) rename {TravellerCore => Traveller.Core}/Features/Metadata.cs (89%) rename {TravellerCore => Traveller.Core}/Features/Position.cs (98%) rename {TravellerCore => Traveller.Core}/Features/Quadrant.cs (86%) rename {TravellerCore => Traveller.Core}/Features/Sector.cs (92%) rename {TravellerCore => Traveller.Core}/Features/SubSector.cs (83%) rename {TravellerCore => Traveller.Core}/Features/World .cs (98%) rename TravellerCore/TravellerCore.csproj => Traveller.Core/Traveller.Core.csproj (100%) rename {TravellerCore => Traveller.Core}/Using.cs (100%) rename {TravellerCore => Traveller.Core}/Util/Astronomy.cs (98%) rename {TravellerParser => Traveller.Parser}/IParser.cs (84%) rename {TravellerParser => Traveller.Parser}/JsonParser.cs (96%) rename TravellerParser/TravellerParser.csproj => Traveller.Parser/Traveller.Parser.csproj (71%) create mode 100644 Traveller.Parser/Using.cs rename {TravellerRenderer => Traveller.Renderer}/TextRenderer.cs (100%) rename TravellerRenderer/TravellerRenderer.csproj => Traveller.Renderer/Traveller.Renderer.csproj (71%) create mode 100644 Traveller.Renderer/Using.cs rename {TravellerCoreTests => Traveller.Tests.Core}/AstronomyTests.cs (96%) rename TravellerCoreTests/TravellerCoreTests.csproj => Traveller.Tests.Core/Traveller.Tests.Core.csproj (87%) delete mode 100644 TravellerParser/Using.cs delete mode 100644 TravellerRenderer/Using.cs diff --git a/.gitignore b/.gitignore index dd53606ff..135972a1a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,4 @@ Thumbs.db /.vs/slnx.sqlite /.vs/Maps/config/applicationhost.config *.testlog -/.vs/Maps/v17/TestStore/0/testlog.manifest +.vs/Maps/v17/ diff --git a/.vs/Maps/DesignTimeBuild/.dtbcache.v2 b/.vs/Maps/DesignTimeBuild/.dtbcache.v2 deleted file mode 100644 index a103e77943c6db83196e6d1a8c87fe64925dfdbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102778 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 NyiYJd*C18n{{i~cH3$Fz diff --git a/Maps.sln b/Maps.sln index 18368cf99..e20db8c19 100644 --- a/Maps.sln +++ b/Maps.sln @@ -5,15 +5,15 @@ VisualStudioVersion = 17.0.31612.314 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maps", "Maps.csproj", "{02AE6284-5044-4A23-B5D6-A86EE9C7DFA1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TravellerCore", "TravellerCore\TravellerCore.csproj", "{1A696030-E073-4053-818D-E8EB72C71A52}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Traveller.Core", "Traveller.Core\Traveller.Core.csproj", "{1A696030-E073-4053-818D-E8EB72C71A52}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TravellerParser", "TravellerParser\TravellerParser.csproj", "{83D4E6B0-9905-4AFE-8D39-674889B56280}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Traveller.Parser", "Traveller.Parser\Traveller.Parser.csproj", "{83D4E6B0-9905-4AFE-8D39-674889B56280}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravellerAPI", "TravellerAPI\TravellerAPI.csproj", "{6DFF70C4-5DE4-44CC-8CF1-B7F145CDF89E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Traveller.API", "Traveller.API\Traveller.API.csproj", "{6DFF70C4-5DE4-44CC-8CF1-B7F145CDF89E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravellerCoreTests", "TravellerCoreTests\TravellerCoreTests.csproj", "{F63CD1A5-C454-4F7C-9F4F-68099B4A634D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Traveller.Tests.Core", "Traveller.Tests.Core\Traveller.Tests.Core.csproj", "{F63CD1A5-C454-4F7C-9F4F-68099B4A634D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TravellerRenderer", "TravellerRenderer\TravellerRenderer.csproj", "{4D7C0D8F-5910-4FE1-8620-EB0F84716C48}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Traveller.Renderer", "Traveller.Renderer\Traveller.Renderer.csproj", "{4D7C0D8F-5910-4FE1-8620-EB0F84716C48}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/TravellerAPI/Controllers/ParsingController.cs b/Traveller.API/Controllers/ParsingController.cs similarity index 100% rename from TravellerAPI/Controllers/ParsingController.cs rename to Traveller.API/Controllers/ParsingController.cs diff --git a/TravellerAPI/Dockerfile b/Traveller.API/Dockerfile similarity index 100% rename from TravellerAPI/Dockerfile rename to Traveller.API/Dockerfile diff --git a/TravellerAPI/Program.cs b/Traveller.API/Program.cs similarity index 96% rename from TravellerAPI/Program.cs rename to Traveller.API/Program.cs index ba315786b..d7c5f9492 100644 --- a/TravellerAPI/Program.cs +++ b/Traveller.API/Program.cs @@ -1,5 +1,5 @@ using Microsoft.OpenApi.Models; -using TravellerParser; +using Traveller.Parser; var builder = WebApplication.CreateBuilder(args); diff --git a/TravellerAPI/Properties/launchSettings.json b/Traveller.API/Properties/launchSettings.json similarity index 100% rename from TravellerAPI/Properties/launchSettings.json rename to Traveller.API/Properties/launchSettings.json diff --git a/TravellerAPI/TravellerAPI.csproj b/Traveller.API/Traveller.API.csproj similarity index 71% rename from TravellerAPI/TravellerAPI.csproj rename to Traveller.API/Traveller.API.csproj index 7ead0b555..d18ac4fda 100644 --- a/TravellerAPI/TravellerAPI.csproj +++ b/Traveller.API/Traveller.API.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -13,8 +13,8 @@ - - + + diff --git a/TravellerAPI/appsettings.Development.json b/Traveller.API/appsettings.Development.json similarity index 100% rename from TravellerAPI/appsettings.Development.json rename to Traveller.API/appsettings.Development.json diff --git a/TravellerAPI/appsettings.json b/Traveller.API/appsettings.json similarity index 100% rename from TravellerAPI/appsettings.json rename to Traveller.API/appsettings.json diff --git a/TravellerCore/Features/Constants.cs b/Traveller.Core/Features/Constants.cs similarity index 98% rename from TravellerCore/Features/Constants.cs rename to Traveller.Core/Features/Constants.cs index e02978eb8..071274d1a 100644 --- a/TravellerCore/Features/Constants.cs +++ b/Traveller.Core/Features/Constants.cs @@ -1,4 +1,4 @@ -namespace TravellerCore.Features; +namespace Traveller.Core.Features; public class Constants { public class Dimensions diff --git a/TravellerCore/Features/Galaxy.cs b/Traveller.Core/Features/Galaxy.cs similarity index 86% rename from TravellerCore/Features/Galaxy.cs rename to Traveller.Core/Features/Galaxy.cs index 9d52127a2..f250f320f 100644 --- a/TravellerCore/Features/Galaxy.cs +++ b/Traveller.Core/Features/Galaxy.cs @@ -1,4 +1,4 @@ -namespace TravellerCore.Features; +namespace Traveller.Core.Features; public class Galaxy : IWorldHolder { public Metadata Metadata { get; init; } diff --git a/TravellerCore/Features/IWorldHolder.cs b/Traveller.Core/Features/IWorldHolder.cs similarity index 81% rename from TravellerCore/Features/IWorldHolder.cs rename to Traveller.Core/Features/IWorldHolder.cs index 6971aac36..0e527bc24 100644 --- a/TravellerCore/Features/IWorldHolder.cs +++ b/Traveller.Core/Features/IWorldHolder.cs @@ -1,4 +1,4 @@ -namespace TravellerCore.Features; +namespace Traveller.Core.Features; public interface IWorldHolder { public Metadata Metadata { get; init; } diff --git a/TravellerCore/Features/Metadata.cs b/Traveller.Core/Features/Metadata.cs similarity index 89% rename from TravellerCore/Features/Metadata.cs rename to Traveller.Core/Features/Metadata.cs index c8be80e00..77509eae9 100644 --- a/TravellerCore/Features/Metadata.cs +++ b/Traveller.Core/Features/Metadata.cs @@ -1,4 +1,4 @@ -namespace TravellerCore.Features; +namespace Traveller.Core.Features; public class Metadata { public string? Title { get; init; } diff --git a/TravellerCore/Features/Position.cs b/Traveller.Core/Features/Position.cs similarity index 98% rename from TravellerCore/Features/Position.cs rename to Traveller.Core/Features/Position.cs index 59dd65409..99f1d56d0 100644 --- a/TravellerCore/Features/Position.cs +++ b/Traveller.Core/Features/Position.cs @@ -1,4 +1,4 @@ -namespace TravellerCore.Features; +namespace Traveller.Core.Features; public class Position { /// Trailing / Right diff --git a/TravellerCore/Features/Quadrant.cs b/Traveller.Core/Features/Quadrant.cs similarity index 86% rename from TravellerCore/Features/Quadrant.cs rename to Traveller.Core/Features/Quadrant.cs index 85e0ea828..4de606f4f 100644 --- a/TravellerCore/Features/Quadrant.cs +++ b/Traveller.Core/Features/Quadrant.cs @@ -1,4 +1,4 @@ -namespace TravellerCore.Features; +namespace Traveller.Core.Features; public class Quadrant : IWorldHolder { public Metadata Metadata { get; init; } diff --git a/TravellerCore/Features/Sector.cs b/Traveller.Core/Features/Sector.cs similarity index 92% rename from TravellerCore/Features/Sector.cs rename to Traveller.Core/Features/Sector.cs index 55f6f33d4..2be8f2cdd 100644 --- a/TravellerCore/Features/Sector.cs +++ b/Traveller.Core/Features/Sector.cs @@ -1,4 +1,4 @@ -namespace TravellerCore.Features; +namespace Traveller.Core.Features; public class Sector : IWorldHolder { public Metadata Metadata { get; init; } diff --git a/TravellerCore/Features/SubSector.cs b/Traveller.Core/Features/SubSector.cs similarity index 83% rename from TravellerCore/Features/SubSector.cs rename to Traveller.Core/Features/SubSector.cs index 8bd10f16a..9408254a0 100644 --- a/TravellerCore/Features/SubSector.cs +++ b/Traveller.Core/Features/SubSector.cs @@ -1,4 +1,4 @@ -namespace TravellerCore.Features; +namespace Traveller.Core.Features; public class SubSector : IWorldHolder { public Metadata Metadata { get; init; } diff --git a/TravellerCore/Features/World .cs b/Traveller.Core/Features/World .cs similarity index 98% rename from TravellerCore/Features/World .cs rename to Traveller.Core/Features/World .cs index 75b6214ed..457506113 100644 --- a/TravellerCore/Features/World .cs +++ b/Traveller.Core/Features/World .cs @@ -1,6 +1,6 @@ using System.Text.RegularExpressions; -namespace TravellerCore.Features; +namespace Traveller.Core.Features; public class World { public string Name { get; init; } diff --git a/TravellerCore/TravellerCore.csproj b/Traveller.Core/Traveller.Core.csproj similarity index 100% rename from TravellerCore/TravellerCore.csproj rename to Traveller.Core/Traveller.Core.csproj diff --git a/TravellerCore/Using.cs b/Traveller.Core/Using.cs similarity index 100% rename from TravellerCore/Using.cs rename to Traveller.Core/Using.cs diff --git a/TravellerCore/Util/Astronomy.cs b/Traveller.Core/Util/Astronomy.cs similarity index 98% rename from TravellerCore/Util/Astronomy.cs rename to Traveller.Core/Util/Astronomy.cs index 24b339f14..91f1a3000 100644 --- a/TravellerCore/Util/Astronomy.cs +++ b/Traveller.Core/Util/Astronomy.cs @@ -1,6 +1,6 @@ -using TravellerCore.Features; +using Traveller.Core.Features; -namespace TravellerCore.Util; +namespace Traveller.Core.Util; /* Traveller uses a “odd-q” vertical layout, which shoves odd columns down diff --git a/TravellerParser/IParser.cs b/Traveller.Parser/IParser.cs similarity index 84% rename from TravellerParser/IParser.cs rename to Traveller.Parser/IParser.cs index 6f462e33d..31ebd2ffa 100644 --- a/TravellerParser/IParser.cs +++ b/Traveller.Parser/IParser.cs @@ -1,4 +1,4 @@ -namespace TravellerParser; +namespace Traveller.Parser; public interface IParser { public bool CanParse(string extension); diff --git a/TravellerParser/JsonParser.cs b/Traveller.Parser/JsonParser.cs similarity index 96% rename from TravellerParser/JsonParser.cs rename to Traveller.Parser/JsonParser.cs index ce635bbff..9d9da59f8 100644 --- a/TravellerParser/JsonParser.cs +++ b/Traveller.Parser/JsonParser.cs @@ -1,6 +1,6 @@ using System.Text.Json; -namespace TravellerParser; +namespace Traveller.Parser; public class JsonParser: IParser { public const string JsonExtension = "json"; diff --git a/TravellerParser/TravellerParser.csproj b/Traveller.Parser/Traveller.Parser.csproj similarity index 71% rename from TravellerParser/TravellerParser.csproj rename to Traveller.Parser/Traveller.Parser.csproj index 918d4c83f..a0bdff668 100644 --- a/TravellerParser/TravellerParser.csproj +++ b/Traveller.Parser/Traveller.Parser.csproj @@ -6,7 +6,7 @@ - + diff --git a/Traveller.Parser/Using.cs b/Traveller.Parser/Using.cs new file mode 100644 index 000000000..a2c6d5668 --- /dev/null +++ b/Traveller.Parser/Using.cs @@ -0,0 +1 @@ +global using Traveller.Core.Features; diff --git a/TravellerRenderer/TextRenderer.cs b/Traveller.Renderer/TextRenderer.cs similarity index 100% rename from TravellerRenderer/TextRenderer.cs rename to Traveller.Renderer/TextRenderer.cs diff --git a/TravellerRenderer/TravellerRenderer.csproj b/Traveller.Renderer/Traveller.Renderer.csproj similarity index 71% rename from TravellerRenderer/TravellerRenderer.csproj rename to Traveller.Renderer/Traveller.Renderer.csproj index 918d4c83f..a0bdff668 100644 --- a/TravellerRenderer/TravellerRenderer.csproj +++ b/Traveller.Renderer/Traveller.Renderer.csproj @@ -6,7 +6,7 @@ - + diff --git a/Traveller.Renderer/Using.cs b/Traveller.Renderer/Using.cs new file mode 100644 index 000000000..a2c6d5668 --- /dev/null +++ b/Traveller.Renderer/Using.cs @@ -0,0 +1 @@ +global using Traveller.Core.Features; diff --git a/TravellerCoreTests/AstronomyTests.cs b/Traveller.Tests.Core/AstronomyTests.cs similarity index 96% rename from TravellerCoreTests/AstronomyTests.cs rename to Traveller.Tests.Core/AstronomyTests.cs index cce867122..5624c55e7 100644 --- a/TravellerCoreTests/AstronomyTests.cs +++ b/Traveller.Tests.Core/AstronomyTests.cs @@ -1,6 +1,6 @@ using NUnit.Framework; -using TravellerCore.Features; -using TravellerCore.Util; +using Traveller.Core.Features; +using Traveller.Core.Util; namespace TravellerCoreTests; public class AstronomyTests diff --git a/TravellerCoreTests/TravellerCoreTests.csproj b/Traveller.Tests.Core/Traveller.Tests.Core.csproj similarity index 87% rename from TravellerCoreTests/TravellerCoreTests.csproj rename to Traveller.Tests.Core/Traveller.Tests.Core.csproj index faf863701..a1c8adbea 100644 --- a/TravellerCoreTests/TravellerCoreTests.csproj +++ b/Traveller.Tests.Core/Traveller.Tests.Core.csproj @@ -15,7 +15,7 @@ - + diff --git a/TravellerParser/Using.cs b/TravellerParser/Using.cs deleted file mode 100644 index d8becc2a1..000000000 --- a/TravellerParser/Using.cs +++ /dev/null @@ -1 +0,0 @@ -global using TravellerCore.Features; diff --git a/TravellerRenderer/Using.cs b/TravellerRenderer/Using.cs deleted file mode 100644 index d8becc2a1..000000000 --- a/TravellerRenderer/Using.cs +++ /dev/null @@ -1 +0,0 @@ -global using TravellerCore.Features;