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. Aptivi/Nitrocid@e8a599b1 is used as a reference. --- Type: ref Breaking: False Doc Required: False Backport Required: False Part: 1/1
Aptivi · Dec 16, 2024 · fe9d588 · fe9d588
1 parent 6c3da61
commit fe9d588
Show file tree

Hide file tree

Showing 37 changed files with 15 additions and 15 deletions.
diff --git a/DocGen/docfx.json b/DocGen/docfx.json
@@ -3,7 +3,7 @@
         {
             "src": [
                 {
-                    "files": [ "Magico/**.csproj" ],
+                    "files": [ "public/**/*.csproj" ],
                     "src": ".."
                 }
             ],

diff --git a/Magico.sln b/Magico.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34622.214
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magico", "Magico\Magico.csproj", "{4B7D3DD5-B086-42ED-A02B-AED489D02088}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magico", "public\Magico\Magico.csproj", "{4B7D3DD5-B086-42ED-A02B-AED489D02088}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magico.Native", "Magico.Native\Magico.Native.csproj", "{4AB82C17-DE9E-4D25-917A-D85F28DDFE05}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magico.Native", "public\Magico.Native\Magico.Native.csproj", "{4AB82C17-DE9E-4D25-917A-D85F28DDFE05}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magico.Tests", "Magico.Tests\Magico.Tests.csproj", "{19BBDE36-C683-4752-B6AA-FCA679CBD118}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magico.Tests", "private\Magico.Tests\Magico.Tests.csproj", "{19BBDE36-C683-4752-B6AA-FCA679CBD118}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magico.Console", "Magico.Console\Magico.Console.csproj", "{F9960134-7F68-40DB-91AA-A95046D897F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Magico.Console", "private\Magico.Console\Magico.Console.csproj", "{F9960134-7F68-40DB-91AA-A95046D897F6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Public", "Public", "{6FD31E96-8BB3-4DB1-95D8-3AE0F6CAB814}"
 EndProject

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 <br>
 
 <img
-  src = 'https://cdn.jsdelivr.net/gh/Aptivi/Magico@master/Magico/OfficialAppIcon-Magico-512.png'
+  src = 'https://cdn.jsdelivr.net/gh/Aptivi/Magico@main/assets/OfficialAppIcon-Magico-512.png'
   width = 256
   align = center
 />

diff --git a/Magico/OfficialAppIcon-Magico-512.png → assets/OfficialAppIcon-Magico-512.png b/Magico/OfficialAppIcon-Magico-512.png → assets/OfficialAppIcon-Magico-512.png
diff --git a/Magico.Console/Magico.Console.csproj → private/Magico.Console/Magico.Console.csproj b/Magico.Console/Magico.Console.csproj → private/Magico.Console/Magico.Console.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Magico\Magico.csproj" />
+    <ProjectReference Include="..\..\public\Magico\Magico.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Magico.Console/Program.cs → private/Magico.Console/Program.cs b/Magico.Console/Program.cs → private/Magico.Console/Program.cs
diff --git a/...co.Console/Properties/launchSettings.json → ...co.Console/Properties/launchSettings.json b/...co.Console/Properties/launchSettings.json → ...co.Console/Properties/launchSettings.json
diff --git a/.../Enumeration/EnumerableExtensionsTests.cs → .../Enumeration/EnumerableExtensionsTests.cs b/.../Enumeration/EnumerableExtensionsTests.cs → .../Enumeration/EnumerableExtensionsTests.cs
diff --git a/Magico.Tests/Files/MagicHandlerTests.cs → ...e/Magico.Tests/Files/MagicHandlerTests.cs b/Magico.Tests/Files/MagicHandlerTests.cs → ...e/Magico.Tests/Files/MagicHandlerTests.cs
diff --git a/Magico.Tests/Magico.Tests.csproj → private/Magico.Tests/Magico.Tests.csproj b/Magico.Tests/Magico.Tests.csproj → private/Magico.Tests/Magico.Tests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Magico\Magico.csproj" />
+    <ProjectReference Include="..\..\public\Magico\Magico.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Magico.Native/Initializer.cs → public/Magico.Native/Initializer.cs b/Magico.Native/Initializer.cs → public/Magico.Native/Initializer.cs
diff --git a/Magico.Native/Interop/MagicFlags.cs → public/Magico.Native/Interop/MagicFlags.cs b/Magico.Native/Interop/MagicFlags.cs → public/Magico.Native/Interop/MagicFlags.cs
diff --git a/Magico.Native/Interop/MagicHelper.cs → public/Magico.Native/Interop/MagicHelper.cs b/Magico.Native/Interop/MagicHelper.cs → public/Magico.Native/Interop/MagicHelper.cs
diff --git a/Magico.Native/Interop/MagicParameters.cs → .../Magico.Native/Interop/MagicParameters.cs b/Magico.Native/Interop/MagicParameters.cs → .../Magico.Native/Interop/MagicParameters.cs
diff --git a/Magico.Native/Magico.Native.csproj → public/Magico.Native/Magico.Native.csproj b/Magico.Native/Magico.Native.csproj → public/Magico.Native/Magico.Native.csproj
@@ -28,8 +28,8 @@
     <None Include="Magico.Native.targets" Pack="True" PackagePath="/" />
 
     <!-- For packaging -->
-    <None Include="../Magico/OfficialAppIcon-Magico-512.png" Pack="true" PackagePath="\" />
-    <None Include="..\README.md" Pack="true" PackagePath="\" />
+    <None Include="..\..\assets\OfficialAppIcon-Magico-512.png" Pack="true" PackagePath="\" />
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Magico.Native/Magico.Native.targets → public/Magico.Native/Magico.Native.targets b/Magico.Native/Magico.Native.targets → public/Magico.Native/Magico.Native.targets
diff --git a/Magico.Native/Properties/AssemblyInfo.cs → .../Magico.Native/Properties/AssemblyInfo.cs b/Magico.Native/Properties/AssemblyInfo.cs → .../Magico.Native/Properties/AssemblyInfo.cs
diff --git a/...e/runtimes/linux-arm64/native/libmagic.so → ...e/runtimes/linux-arm64/native/libmagic.so b/...e/runtimes/linux-arm64/native/libmagic.so → ...e/runtimes/linux-arm64/native/libmagic.so
diff --git a/...ive/runtimes/linux-x64/native/libmagic.so → ...ive/runtimes/linux-x64/native/libmagic.so b/...ive/runtimes/linux-x64/native/libmagic.so → ...ive/runtimes/linux-x64/native/libmagic.so
diff --git a/.../runtimes/osx-arm64/native/libmagic.dylib → .../runtimes/osx-arm64/native/libmagic.dylib b/.../runtimes/osx-arm64/native/libmagic.dylib → .../runtimes/osx-arm64/native/libmagic.dylib
diff --git a/...ve/runtimes/osx-x64/native/libmagic.dylib → ...ve/runtimes/osx-x64/native/libmagic.dylib b/...ve/runtimes/osx-x64/native/libmagic.dylib → ...ve/runtimes/osx-x64/native/libmagic.dylib
diff --git a/.../runtimes/win-arm64/native/libiconv-2.dll → .../runtimes/win-arm64/native/libiconv-2.dll b/.../runtimes/win-arm64/native/libiconv-2.dll → .../runtimes/win-arm64/native/libiconv-2.dll
diff --git a/...e/runtimes/win-arm64/native/libintl-8.dll → ...e/runtimes/win-arm64/native/libintl-8.dll b/...e/runtimes/win-arm64/native/libintl-8.dll → ...e/runtimes/win-arm64/native/libintl-8.dll
diff --git a/...ve/runtimes/win-arm64/native/libmagic.dll → ...ve/runtimes/win-arm64/native/libmagic.dll b/...ve/runtimes/win-arm64/native/libmagic.dll → ...ve/runtimes/win-arm64/native/libmagic.dll
diff --git a/...runtimes/win-arm64/native/libsystre-0.dll → ...runtimes/win-arm64/native/libsystre-0.dll b/...runtimes/win-arm64/native/libsystre-0.dll → ...runtimes/win-arm64/native/libsystre-0.dll
diff --git a/...ve/runtimes/win-arm64/native/libtre-5.dll → ...ve/runtimes/win-arm64/native/libtre-5.dll b/...ve/runtimes/win-arm64/native/libtre-5.dll → ...ve/runtimes/win-arm64/native/libtre-5.dll
diff --git a/...ve/runtimes/win-x64/native/libiconv-2.dll → ...ve/runtimes/win-x64/native/libiconv-2.dll b/...ve/runtimes/win-x64/native/libiconv-2.dll → ...ve/runtimes/win-x64/native/libiconv-2.dll
diff --git a/...ive/runtimes/win-x64/native/libintl-8.dll → ...ive/runtimes/win-x64/native/libintl-8.dll b/...ive/runtimes/win-x64/native/libintl-8.dll → ...ive/runtimes/win-x64/native/libintl-8.dll
diff --git a/...tive/runtimes/win-x64/native/libmagic.dll → ...tive/runtimes/win-x64/native/libmagic.dll b/...tive/runtimes/win-x64/native/libmagic.dll → ...tive/runtimes/win-x64/native/libmagic.dll
diff --git a/...e/runtimes/win-x64/native/libsystre-0.dll → ...e/runtimes/win-x64/native/libsystre-0.dll b/...e/runtimes/win-x64/native/libsystre-0.dll → ...e/runtimes/win-x64/native/libsystre-0.dll
diff --git a/...tive/runtimes/win-x64/native/libtre-5.dll → ...tive/runtimes/win-x64/native/libtre-5.dll b/...tive/runtimes/win-x64/native/libtre-5.dll → ...tive/runtimes/win-x64/native/libtre-5.dll
diff --git a/Magico/Enumeration/EnumerableExtensions.cs → ...agico/Enumeration/EnumerableExtensions.cs b/Magico/Enumeration/EnumerableExtensions.cs → ...agico/Enumeration/EnumerableExtensions.cs
diff --git a/Magico/Files/MagicException.cs → public/Magico/Files/MagicException.cs b/Magico/Files/MagicException.cs → public/Magico/Files/MagicException.cs
diff --git a/Magico/Files/MagicHandler.cs → public/Magico/Files/MagicHandler.cs b/Magico/Files/MagicHandler.cs → public/Magico/Files/MagicHandler.cs
diff --git a/Magico/Magico.csproj → public/Magico/Magico.csproj b/Magico/Magico.csproj → public/Magico/Magico.csproj
@@ -21,23 +21,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\README.md">
+    <None Include="..\..\README.md">
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
 
   <ItemGroup>
     <None Include="Magico.targets" Pack="True" PackagePath="build" />
-    <None Include="../assets/magic.mgc" Pack="True" PackagePath="magic" CopyToOutputDirectory="Always" />
+    <None Include="../../assets/magic.mgc" Pack="True" PackagePath="magic" CopyToOutputDirectory="Always" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="OfficialAppIcon-Magico-512.png" Pack="true" PackagePath="\" />
+    <None Include="../../assets/OfficialAppIcon-Magico-512.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Magico.Native\Magico.Native.csproj" />
+    <ProjectReference Include="..\..\public\Magico.Native\Magico.Native.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Magico/Magico.targets → public/Magico/Magico.targets b/Magico/Magico.targets → public/Magico/Magico.targets
diff --git 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