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 8b6e01d commit f83ce32
Show file tree
Hide file tree
Showing 21 changed files with 16 additions and 8 deletions.
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": [ "Metalinker/**.csproj" ],
"files": [ "public/**/*.csproj" ],
"src": ".."
}
],
Expand Down
12 changes: 10 additions & 2 deletions Metalinker.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.35219.272
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Metalinker", "Metalinker\Metalinker.csproj", "{ED990317-51BA-4B0F-85B0-A74B604904F3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Metalinker", "public\Metalinker\Metalinker.csproj", "{ED990317-51BA-4B0F-85B0-A74B604904F3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Metalinker.Tests", "Metalinker.Tests\Metalinker.Tests.csproj", "{D532EF5D-097F-4193-ADEE-E6990C9B3425}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Metalinker.Tests", "private\Metalinker.Tests\Metalinker.Tests.csproj", "{D532EF5D-097F-4193-ADEE-E6990C9B3425}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{BEFE2FE1-8B1B-473D-A9A8-03D105E15F0A}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -14,6 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{BEFE2F
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Public", "Public", "{D0C3AB38-B69A-40E4-B6A7-8B0AE4D8DC82}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Private", "Private", "{6309B122-0AD8-42A8-BB4B-F409C47B94B9}"
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
{ED990317-51BA-4B0F-85B0-A74B604904F3} = {D0C3AB38-B69A-40E4-B6A7-8B0AE4D8DC82}
{D532EF5D-097F-4193-ADEE-E6990C9B3425} = {6309B122-0AD8-42A8-BB4B-F409C47B94B9}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {19FE220C-BDE4-4AAC-810A-70CFAE46E56B}
EndGlobalSection
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/Metalinker@main/Metalinker/OfficialAppIcon-Metalinker-512.png'
src = 'https://cdn.jsdelivr.net/gh/Aptivi/Metalinker@main/assets/OfficialAppIcon-Metalinker-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 @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Metalinker\Metalinker.csproj" />
<ProjectReference Include="..\..\public\Metalinker\Metalinker.csproj" />
</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.
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
</PropertyGroup>

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

<ItemGroup>
<None Include="OfficialAppIcon-Metalinker-512.png">
<None Include="..\..\assets\OfficialAppIcon-Metalinker-512.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
Expand Down
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 f83ce32

Please sign in to comment.