From 43281fafebaff560d03b39ba54a7badf9d338314 Mon Sep 17 00:00:00 2001 From: Aptivi CEO Date: Mon, 16 Dec 2024 22:39:35 +0300 Subject: [PATCH] ref - Project file re-arrangement --- We've rearranged the project file structure to make the root directory cleaner than before. This is done according to the Nitrocid KS project structure materialized in 2022. https://github.com/Aptivi/NitrocidKS/commit/e8a599b1 is used as a reference. --- Type: ref Breaking: False Doc Required: False Backport Required: False Part: 1/1 --- ChemiStar.sln | 12 ++++++++++-- ChemiStar/assets/Periodic-Table-JSON | 1 - DocGen/docfx.json | 2 +- README.md | 2 +- .../OfficialAppIcon-ChemiStar-512.png | Bin .../ChemiStar.Tests}/ChemiStar.Tests.csproj | 2 +- .../Helpers/PeriodicTableQueryHelpers.cs | 0 .../ChemiStar.Tests}/PeriodicTableTests.cs | 0 {ChemiStar => public/ChemiStar}/ChemiStar.csproj | 8 ++++---- .../ChemiStar}/Data/SubstanceImage.cs | 0 .../ChemiStar}/Data/SubstanceInfo.cs | 0 .../ChemiStar}/Data/SubstancePhase.cs | 0 .../ChemiStar}/Exceptions/NoSubstanceException.cs | 0 .../ChemiStar}/PeriodicTableParser.cs | 0 tools/push.sh | 2 +- 15 files changed, 18 insertions(+), 11 deletions(-) delete mode 160000 ChemiStar/assets/Periodic-Table-JSON rename {ChemiStar => assets}/OfficialAppIcon-ChemiStar-512.png (100%) rename {ChemiStar.Tests => private/ChemiStar.Tests}/ChemiStar.Tests.csproj (81%) rename {ChemiStar.Tests => private/ChemiStar.Tests}/Helpers/PeriodicTableQueryHelpers.cs (100%) rename {ChemiStar.Tests => private/ChemiStar.Tests}/PeriodicTableTests.cs (100%) rename {ChemiStar => public/ChemiStar}/ChemiStar.csproj (83%) rename {ChemiStar => public/ChemiStar}/Data/SubstanceImage.cs (100%) rename {ChemiStar => public/ChemiStar}/Data/SubstanceInfo.cs (100%) rename {ChemiStar => public/ChemiStar}/Data/SubstancePhase.cs (100%) rename {ChemiStar => public/ChemiStar}/Exceptions/NoSubstanceException.cs (100%) rename {ChemiStar => public/ChemiStar}/PeriodicTableParser.cs (100%) diff --git a/ChemiStar.sln b/ChemiStar.sln index 88a3585..3616deb 100644 --- a/ChemiStar.sln +++ b/ChemiStar.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.11.35208.52 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChemiStar", "ChemiStar\ChemiStar.csproj", "{0C8F33EC-A0C7-4763-B909-59FE69CFF2EE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChemiStar", "public\ChemiStar\ChemiStar.csproj", "{0C8F33EC-A0C7-4763-B909-59FE69CFF2EE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChemiStar.Tests", "ChemiStar.Tests\ChemiStar.Tests.csproj", "{2E3FE771-60D5-4AF9-BED7-E8B905479190}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChemiStar.Tests", "private\ChemiStar.Tests\ChemiStar.Tests.csproj", "{2E3FE771-60D5-4AF9-BED7-E8B905479190}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{87739C97-A64F-4530-AE27-F7FC2DBFDDC6}" ProjectSection(SolutionItems) = preProject @@ -14,6 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{87739C Directory.Build.props = Directory.Build.props EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Public", "Public", "{3F4BE858-4143-4D55-8ACB-229004032DFF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Private", "Private", "{75AD7905-972C-45C7-A01D-D3EAADD1F029}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -32,6 +36,10 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {0C8F33EC-A0C7-4763-B909-59FE69CFF2EE} = {3F4BE858-4143-4D55-8ACB-229004032DFF} + {2E3FE771-60D5-4AF9-BED7-E8B905479190} = {75AD7905-972C-45C7-A01D-D3EAADD1F029} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {81EEBA33-3EA5-42B3-867A-3BA5429FF60C} EndGlobalSection diff --git a/ChemiStar/assets/Periodic-Table-JSON b/ChemiStar/assets/Periodic-Table-JSON deleted file mode 160000 index ea41119..0000000 --- a/ChemiStar/assets/Periodic-Table-JSON +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ea41119626581350fdcdd9c873de233645a43023 diff --git a/DocGen/docfx.json b/DocGen/docfx.json index 606ad6f..22b0e9d 100644 --- a/DocGen/docfx.json +++ b/DocGen/docfx.json @@ -3,7 +3,7 @@ { "src": [ { - "files": [ "ChemiStar/**.csproj" ], + "files": [ "public/**/*.csproj" ], "src": ".." } ], diff --git a/README.md b/README.md index 8805ab7..0d7721e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@
diff --git a/ChemiStar/OfficialAppIcon-ChemiStar-512.png b/assets/OfficialAppIcon-ChemiStar-512.png similarity index 100% rename from ChemiStar/OfficialAppIcon-ChemiStar-512.png rename to assets/OfficialAppIcon-ChemiStar-512.png diff --git a/ChemiStar.Tests/ChemiStar.Tests.csproj b/private/ChemiStar.Tests/ChemiStar.Tests.csproj similarity index 81% rename from ChemiStar.Tests/ChemiStar.Tests.csproj rename to private/ChemiStar.Tests/ChemiStar.Tests.csproj index d810a15..d3c5775 100644 --- a/ChemiStar.Tests/ChemiStar.Tests.csproj +++ b/private/ChemiStar.Tests/ChemiStar.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/ChemiStar.Tests/Helpers/PeriodicTableQueryHelpers.cs b/private/ChemiStar.Tests/Helpers/PeriodicTableQueryHelpers.cs similarity index 100% rename from ChemiStar.Tests/Helpers/PeriodicTableQueryHelpers.cs rename to private/ChemiStar.Tests/Helpers/PeriodicTableQueryHelpers.cs diff --git a/ChemiStar.Tests/PeriodicTableTests.cs b/private/ChemiStar.Tests/PeriodicTableTests.cs similarity index 100% rename from ChemiStar.Tests/PeriodicTableTests.cs rename to private/ChemiStar.Tests/PeriodicTableTests.cs diff --git a/ChemiStar/ChemiStar.csproj b/public/ChemiStar/ChemiStar.csproj similarity index 83% rename from ChemiStar/ChemiStar.csproj rename to public/ChemiStar/ChemiStar.csproj index 8442c04..267a818 100644 --- a/ChemiStar/ChemiStar.csproj +++ b/public/ChemiStar/ChemiStar.csproj @@ -18,22 +18,22 @@ - + True \ - + True \ - - + + diff --git a/ChemiStar/Data/SubstanceImage.cs b/public/ChemiStar/Data/SubstanceImage.cs similarity index 100% rename from ChemiStar/Data/SubstanceImage.cs rename to public/ChemiStar/Data/SubstanceImage.cs diff --git a/ChemiStar/Data/SubstanceInfo.cs b/public/ChemiStar/Data/SubstanceInfo.cs similarity index 100% rename from ChemiStar/Data/SubstanceInfo.cs rename to public/ChemiStar/Data/SubstanceInfo.cs diff --git a/ChemiStar/Data/SubstancePhase.cs b/public/ChemiStar/Data/SubstancePhase.cs similarity index 100% rename from ChemiStar/Data/SubstancePhase.cs rename to public/ChemiStar/Data/SubstancePhase.cs diff --git a/ChemiStar/Exceptions/NoSubstanceException.cs b/public/ChemiStar/Exceptions/NoSubstanceException.cs similarity index 100% rename from ChemiStar/Exceptions/NoSubstanceException.cs rename to public/ChemiStar/Exceptions/NoSubstanceException.cs diff --git a/ChemiStar/PeriodicTableParser.cs b/public/ChemiStar/PeriodicTableParser.cs similarity index 100% rename from ChemiStar/PeriodicTableParser.cs rename to public/ChemiStar/PeriodicTableParser.cs diff --git a/tools/push.sh b/tools/push.sh index 7d845bc..209d999 100644 --- a/tools/push.sh +++ b/tools/push.sh @@ -36,7 +36,7 @@ checkerror $? "dotnet is not found" # Push packages echo Pushing packages... -find .. -type f -path "*/bin/$releaseconf/*.nupkg" -exec dotnet nuget push {} --api-key $NUGET_APIKEY --source "nuget.org" \; +find .. -type f -path "**/bin/$releaseconf/*.nupkg" -exec dotnet nuget push {} --api-key $NUGET_APIKEY --source "nuget.org" \; checkerror $? "Failed to push" # Inform success