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 5, 2024
1 parent f65556d commit 6410676
Show file tree
Hide file tree
Showing 130 changed files with 20 additions and 17 deletions.
6 changes: 3 additions & 3 deletions BassBoom.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34009.444
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BassBoom.Native", "BassBoom.Native\BassBoom.Native.csproj", "{E72C2A3C-70EC-48E7-91CD-4F76F7722AAB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BassBoom.Native", "public\BassBoom.Native\BassBoom.Native.csproj", "{E72C2A3C-70EC-48E7-91CD-4F76F7722AAB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BassBoom.Basolia", "BassBoom.Basolia\BassBoom.Basolia.csproj", "{738C2D2F-E4DC-4FDB-8766-BC41DE5DDFF2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BassBoom.Basolia", "public\BassBoom.Basolia\BassBoom.Basolia.csproj", "{738C2D2F-E4DC-4FDB-8766-BC41DE5DDFF2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BassBoom.Cli", "BassBoom.Cli\BassBoom.Cli.csproj", "{7EBD3EB6-554E-46E1-B72E-8CF9F7E34F8B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BassBoom.Cli", "private\BassBoom.Cli\BassBoom.Cli.csproj", "{7EBD3EB6-554E-46E1-B72E-8CF9F7E34F8B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{EDC78D55-4B85-422E-9F6A-46B47C7C88EF}"
ProjectSection(SolutionItems) = preProject
Expand Down
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": [ "BassBoom.Basolia/**.csproj" ],
"files": [ "public/**/*.csproj" ],
"src": ".."
}
],
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
OUTPUTS = BassBoom.*/bin BassBoom.*/obj BassBoom/bin BassBoom/obj
ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
OUTPUTS := \
-name "bin" -or \
-name "obj"

.PHONY: all

Expand All @@ -16,6 +19,6 @@ doc:
$(MAKE) -C tools invoke-doc-build

clean:
rm -rf $(OUTPUTS)
find $(ROOT_DIR) -type d \( $(OUTPUTS) \) -print -exec rm -rf {} +

# This makefile is just a wrapper for tools scripts.
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/BassBoom@main/BassBoom/OfficialAppIcon-BassBoom-512.png'
src = 'https://cdn.jsdelivr.net/gh/Aptivi/BassBoom@main/assets/OfficialAppIcon-BassBoom-512.png'
width = 256
align = center
/>
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<PropertyGroup>
<TargetFrameworks>net8.0;net48</TargetFrameworks>
<OutputType>Exe</OutputType>
<ApplicationIcon>../BassBoom/Assets/OfficialAppIcon-BassBoom.ico</ApplicationIcon>
<ApplicationIcon>../../assets/OfficialAppIcon-BassBoom.ico</ApplicationIcon>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Terminaux" Version="5.4.2.1" />
</ItemGroup>

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

<ItemGroup>
Expand All @@ -22,8 +22,8 @@
</Target>

<ItemGroup>
<None Remove="..\BassBoom\Assets\sample.mp3" />
<EmbeddedResource Include="..\BassBoom\Assets\sample.mp3" />
<None Remove="../../assets/sample.mp3" />
<EmbeddedResource Include="../../assets/sample.mp3" />
</ItemGroup>

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

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

<ItemGroup>
<None Include="../BassBoom/Assets/OfficialAppIcon-BassBoom-512.png" Pack="true" PackagePath="\" />
<None Include="..\README.md" Pack="true" PackagePath="\" />
<None Include="../../assets/OfficialAppIcon-BassBoom-512.png" Pack="true" PackagePath="\" />
<None Include="../../README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<None Include="BassBoom.Native.targets" Pack="True" PackagePath="/" />

<!-- For packaging -->
<None Include="../BassBoom/Assets/OfficialAppIcon-BassBoom-512.png" Pack="true" PackagePath="\" />
<None Include="..\README.md" Pack="true" PackagePath="\" />
<None Include="../../assets/OfficialAppIcon-BassBoom-512.png" Pack="true" PackagePath="\" />
<None Include="../../README.md" Pack="true" PackagePath="\" />
</ItemGroup>

<ItemGroup>
Expand Down
File renamed without changes.
File renamed without changes.
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 6410676

Please sign in to comment.