Skip to content

Commit

Permalink
ref - Project file re-arrangement
Browse files Browse the repository at this point in the history
---

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.

Aptivi/Nitrocid@e8a599b1 is used as a
reference.

---

Type: ref
Breaking: False
Doc Required: False
Backport Required: False
Part: 1/1
  • Loading branch information
AptiviCEO committed Dec 16, 2024
1 parent 3b5530a commit 43281fa
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 11 deletions.
12 changes: 10 additions & 2 deletions ChemiStar.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion ChemiStar/assets/Periodic-Table-JSON
Submodule Periodic-Table-JSON deleted from ea4111
2 changes: 1 addition & 1 deletion DocGen/docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"src": [
{
"files": [ "ChemiStar/**.csproj" ],
"files": [ "public/**/*.csproj" ],
"src": ".."
}
],
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<br>

<img
src = 'https://cdn.jsdelivr.net/gh/Aptivi/ChemiStar@main/ChemiStar/OfficialAppIcon-ChemiStar-512.png'
src = 'https://cdn.jsdelivr.net/gh/Aptivi/ChemiStar@main/assets/OfficialAppIcon-ChemiStar-512.png'
width = 256
align = center
/>
Expand Down
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ChemiStar\ChemiStar.csproj" />
<ProjectReference Include="..\..\public\ChemiStar\ChemiStar.csproj" />
</ItemGroup>

</Project>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@
</PropertyGroup>

<ItemGroup>
<None Include="..\README.md">
<None Include="..\..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<None Include="OfficialAppIcon-ChemiStar-512.png">
<None Include="..\..\assets\OfficialAppIcon-ChemiStar-512.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="assets\Periodic-Table-JSON\PeriodicTableJSON.json" />
<EmbeddedResource Include="assets\Periodic-Table-JSON\schemas\periodicTableJSON.schema" />
<EmbeddedResource Include="..\..\assets\Periodic-Table-JSON\PeriodicTableJSON.json" />
<EmbeddedResource Include="..\..\assets\Periodic-Table-JSON\schemas\periodicTableJSON.schema" />
</ItemGroup>

<ItemGroup>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 43281fa

Please sign in to comment.